diff --git a/ChangeLog b/ChangeLog
index 50ede8d..ace1be4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 0.8.2
 =====
+  25-May-2014:  - PLUGIN_PROCESS_RAW: properly deal with the situation if a
+                  RAW plugin modifies the message lengh.
+  11-Feb-2013:  - plugin_defaulttarget: add "received from" IP to logging
   07-Apr-2012:  - Some compatibility hack with newer libtool versions
   10-Jul-2011:  - Added --with-included-libtool to configure to allow
                   forcing the use of the included libltdl
diff --git a/TODO b/TODO
index 4ddda0c..16bae4c 100644
--- a/TODO
+++ b/TODO
@@ -24,3 +24,7 @@ RFC3261 non-compliance:
 - Record-Route header handling
 
 - OpenBSD: Warning for redefinition of MACROS
+
+- remove URLMAP_SIZE and RTPPROXY_SIZE constants, make them configurable 
+  at runtime.
+
diff --git a/src/siproxd.c b/src/siproxd.c
index c4abc9c..5e0b8b7 100644
--- a/src/siproxd.c
+++ b/src/siproxd.c
@@ -408,7 +408,7 @@ int main (int argc, char *argv[])
       /*
        * integrity checks
        */
-      sts=security_check_raw(buff, buflen);
+      sts=security_check_raw(ticket.raw_buffer, ticket.raw_buffer_len);
       if (sts != STS_SUCCESS) {
          DEBUGC(DBCLASS_SIP,"security check (raw) failed");
          continue; /* there are no resources to free */
@@ -417,7 +417,7 @@ int main (int argc, char *argv[])
       /*
        * Hacks to fix-up some broken headers
        */
-      sts=sip_fixup_asterisk(buff, &buflen);
+      sts=sip_fixup_asterisk(ticket.raw_buffer, &ticket.raw_buffer_len);
 
       /*
        * init sip_msg
@@ -434,10 +434,10 @@ int main (int argc, char *argv[])
        * Proxy Behavior - Request Validation - Reasonable Syntax
        * (parse the received message)
        */
-      sts=sip_message_parse(ticket.sipmsg, buff, buflen);
+      sts=sip_message_parse(ticket.sipmsg, ticket.raw_buffer, ticket.raw_buffer_len);
       if (sts != 0) {
          ERROR("sip_message_parse() failed, sts=%i... this is not good", sts);
-         DUMP_BUFFER(-1, buff, buflen);
+         DUMP_BUFFER(-1, ticket.raw_buffer, ticket.raw_buffer_len);
          goto end_loop; /* skip and free resources */
       }
 
@@ -447,7 +447,7 @@ int main (int argc, char *argv[])
       sts=security_check_sip(&ticket);
       if (sts != STS_SUCCESS) {
          ERROR("security_check_sip() failed, sts=%i... this is not good", sts);
-         DUMP_BUFFER(-1, buff, buflen);
+         DUMP_BUFFER(-1, ticket.raw_buffer, ticket.raw_buffer_len);
          goto end_loop; /* skip and free resources */
       }