diff --git a/headers/modsecurity/assay.h b/headers/modsecurity/assay.h
index 553f8769..a5eec221 100644
--- a/headers/modsecurity/assay.h
+++ b/headers/modsecurity/assay.h
@@ -104,6 +104,7 @@ class ModSecurityStringVariables :
         if (updateFirstVariable(key, value) == false) {
             storeVariable(key, value);
         }
+        return true;
     }
 
 
diff --git a/headers/modsecurity/rules.h b/headers/modsecurity/rules.h
index 25a00201..1aca0350 100644
--- a/headers/modsecurity/rules.h
+++ b/headers/modsecurity/rules.h
@@ -28,11 +28,6 @@
 #ifndef HEADERS_MODSECURITY_RULES_H_
 #define HEADERS_MODSECURITY_RULES_H_
 
-#ifndef __cplusplus
-typedef struct Rules_t Rules;
-typedef struct Assay_t Assay;
-#endif
-
 #include "modsecurity/modsecurity.h"
 #include "modsecurity/assay.h"
 #include "modsecurity/rules_properties.h"
diff --git a/src/operators/pm.cc b/src/operators/pm.cc
index fb3da401..e4f19d11 100644
--- a/src/operators/pm.cc
+++ b/src/operators/pm.cc
@@ -93,8 +93,9 @@ bool Pm::init(const char **error) {
         acmp_add_pattern(m_p, a.c_str(), NULL, NULL, a.length());
     }
 
-
     acmp_prepare(m_p);
+
+    return true;
 }
 
 
diff --git a/src/request_body_processor/multipart.cc b/src/request_body_processor/multipart.cc
index f17c18f3..011a1771 100644
--- a/src/request_body_processor/multipart.cc
+++ b/src/request_body_processor/multipart.cc
@@ -44,12 +44,11 @@ bool Multipart::init() {
     }
 
     std::size_t boundary_pos = m_header.find("boundary");
-    if (boundary_pos < 0) {
-        if (boundary_pos > 0 && m_header.find("boundary", boundary_pos) > 0) {
-            debug(4, "Multipart: Multiple boundary parameters in " \
-                "Content-Type.");
-            return false;
-        }
+    if (boundary_pos != std::string::npos &&
+        m_header.find("boundary", boundary_pos + 1) != std::string::npos) {
+        debug(4, "Multipart: Multiple boundary parameters in " \
+            "Content-Type.");
+        return false;
     }
 
     std::string boundary = m_header.c_str() + boundary_pos;
diff --git a/src/request_body_processor/multipart_blob.cc b/src/request_body_processor/multipart_blob.cc
index 9e2ffeb3..5070d72a 100644
--- a/src/request_body_processor/multipart_blob.cc
+++ b/src/request_body_processor/multipart_blob.cc
@@ -70,6 +70,8 @@ bool MultipartBlob::processContent() {
         offset = end + 1;
     }
     content = std::string(m_blob, offset, m_blob.length() - offset + 1);
+
+    return true;
 }
 
 
@@ -123,6 +125,8 @@ bool MultipartBlob::processContentDispositionLine(
             filename = std::string(dispositionLine, offset, end - offset);
         }
     }
+
+    return true;
 }
 
 
diff --git a/src/utils/acmp.cc b/src/utils/acmp.cc
index 08575863..82f691f4 100644
--- a/src/utils/acmp.cc
+++ b/src/utils/acmp.cc
@@ -52,7 +52,7 @@ char *parse_pm_content(const char *op_parm, unsigned short int op_len, const cha
         return NULL;
     }
 
-    while (offset < op_len && content[offset] == ' ' || content[offset] == '\t') {
+    while (offset < op_len && (content[offset] == ' ' || content[offset] == '\t')) {
         offset++;
     };
 
@@ -380,7 +380,7 @@ static int acmp_connect_fail_branches(ACMP *parser) {
     std::vector<acmp_node_t *> arr2;
     std::vector<acmp_node_t *> tmp;
 
-    parser->root_node->text = "";
+    parser->root_node->text = (char *)"";
 
     parser->root_node->fail = parser->root_node;
 
@@ -496,7 +496,7 @@ if (parser->is_active != 0) return -1;
         if (child == NULL) {
             child = (acmp_node_t *) calloc(1, sizeof(acmp_node_t));
             /* ENH: Check alloc succeded */
-            child->pattern = "";
+            child->pattern = (char *)"";
             child->letter = letter;
             child->depth = i;
             child->text = (char *)calloc(1, strlen(pattern) + 2);
diff --git a/src/utils/md5.cc b/src/utils/md5.cc
index aff9645b..e7babf76 100644
--- a/src/utils/md5.cc
+++ b/src/utils/md5.cc
@@ -59,19 +59,19 @@ documentation and/or software.
  
 // F, G, H and I are basic MD5 functions.
 inline MD5::uint4 MD5::F(uint4 x, uint4 y, uint4 z) {
-  return x&y | ~x&z;
+  return (x & y) | (~x & z);
 }
  
 inline MD5::uint4 MD5::G(uint4 x, uint4 y, uint4 z) {
-  return x&z | y&~z;
+  return (x & z) | (y & ~z);
 }
  
 inline MD5::uint4 MD5::H(uint4 x, uint4 y, uint4 z) {
-  return x^y^z;
+  return (x ^ y ^ z);
 }
  
 inline MD5::uint4 MD5::I(uint4 x, uint4 y, uint4 z) {
-  return y ^ (x | ~z);
+  return (y ^ (x | ~z));
 }
  
 // rotate_left rotates x left n bits.
diff --git a/test/regression/custom_debug_log.cc b/test/regression/custom_debug_log.cc
index 88124f20..8fca802b 100644
--- a/test/regression/custom_debug_log.cc
+++ b/test/regression/custom_debug_log.cc
@@ -30,6 +30,7 @@ CustomDebugLog *CustomDebugLog::new_instance() {
 
 bool CustomDebugLog::write_log(int level, const std::string& message) {
     m_log << "[" << level << "] " << message << std::endl;
+    return true;
 }