diff --git a/CHANGES b/CHANGES
index 90849f93..9ccc78c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,14 +5,12 @@ v3.0.3 - YYYY-MMM-DD (to be released)
    [Issue #1771 - @Artistan]
  - Checks if response body inspection is enabled before process it
    [Issue #1643 - @zoltan-fedor, @dennus, @defanator, @zimmerle]
- - processContentOffset Cleanup
-   [Issue #1757 - @p0pr0ck5]
+ - Code Cleanup.
+   [Issue #1757, #1755, #1756, #1761 - @p0pr0ck5]
  - Fix setvar parsing of quoted data
    [Issue #1733, #1759 - @JaiHarpalani, @victorhora, @defanator]
  - Fix LDFLAGS for unit tests.
    [Issue #1758 - @smlx]
- - Code cosmetics: Clean up MD5 hexdigest
-   [Issue #1761 - @p0pr0ck5]
  - Adds time stamp back to the audit logs
    [Issue #1762 - @Pjack, @zimmerle]
  - Disables skip counter if debug log is disabled
diff --git a/src/actions/transformations/url_decode.cc b/src/actions/transformations/url_decode.cc
index 82706d7e..3c2e3e6d 100644
--- a/src/actions/transformations/url_decode.cc
+++ b/src/actions/transformations/url_decode.cc
@@ -40,7 +40,7 @@ UrlDecode::UrlDecode(std::string action)
 std::string UrlDecode::evaluate(std::string value,
     Transaction *transaction) {
     unsigned char *val = NULL;
-    int invalid_count;
+    int invalid_count = 0;
     int changed;
 
     val = (unsigned char *) malloc(sizeof(char) * value.size() + 1);
diff --git a/src/utils/msc_tree.cc b/src/utils/msc_tree.cc
index 5076da2f..b65fd847 100644
--- a/src/utils/msc_tree.cc
+++ b/src/utils/msc_tree.cc
@@ -461,8 +461,11 @@ TreeNode *CPTAddElement(unsigned char *ipdata, unsigned int ip_bitmask, CPTTree
     } else {
         i_node = CPTCreateNode();
 
-        if(i_node == NULL)
+        if (i_node == NULL) {
+            free(new_node->prefix);
+            free(new_node);
             return NULL;
+        }
 
         //i_node->prefix = NULL;
         i_node->bit = test_bit;
@@ -480,6 +483,9 @@ TreeNode *CPTAddElement(unsigned char *ipdata, unsigned int ip_bitmask, CPTTree
             i_node->netmasks = reinterpret_cast<unsigned char *>(malloc((node->count - i) * sizeof(unsigned char)));
 
             if(i_node->netmasks == NULL) {
+                free(new_node->prefix);
+                free(new_node);
+                free(i_node);
                 return NULL;
             }