diff --git a/src/utils/base64.cc b/src/utils/base64.cc
index 5ddc6b84..c3b52764 100644
--- a/src/utils/base64.cc
+++ b/src/utils/base64.cc
@@ -152,9 +152,9 @@ void Base64::decode_forgiven_engine(unsigned char *plain_text,
         ch = b64_reverse_t[ch];
         if (ch < 0) {
             continue;
-        } else if (ch == -2) {
+        /*} else if (ch == -2) {
             *aiming_size = 0;
-            return;
+            return;*/
         }
         switch (i % 4) {
             case 0:
diff --git a/src/utils/geo_lookup.h b/src/utils/geo_lookup.h
index 2d0627af..347bc572 100644
--- a/src/utils/geo_lookup.h
+++ b/src/utils/geo_lookup.h
@@ -54,10 +54,11 @@ class GeoLookup {
 
  private:
     GeoLookup() :
+        m_version(NOT_LOADED)
 #if WITH_GEOIP
-        m_gi(NULL),
+        ,m_gi(NULL)
 #endif
-        m_version(NOT_LOADED) { }
+        { }
     ~GeoLookup();
     GeoLookup(GeoLookup const&);
     void operator=(GeoLookup const&);
diff --git a/src/utils/shared_files.h b/src/utils/shared_files.h
index 47f06d2d..66edcb68 100644
--- a/src/utils/shared_files.h
+++ b/src/utils/shared_files.h
@@ -75,12 +75,13 @@ class SharedFiles {
  private:
     SharedFiles()
 #ifdef MODSEC_USE_GENERAL_LOCK
-        : m_generalLock(NULL)
+        : m_generalLock(NULL),
+        m_memKeyStructure(0)
 #endif
     {
 #ifdef MODSEC_USE_GENERAL_LOCK
         int shm_id;
-        bool toBeCreated = true;
+        bool toBeCreated;
         bool err = false;
 
         m_memKeyStructure = ftok(".", 1);
@@ -122,7 +123,6 @@ err_shmget1:
 err_shmat1:
             std::cerr << "err_shmat1" << std::endl;
         }
-        toBeCreated = false;
 #endif
     }
     ~SharedFiles() {
diff --git a/test/cppcheck_suppressions.txt b/test/cppcheck_suppressions.txt
index 0edcf180..b0536f1b 100644
--- a/test/cppcheck_suppressions.txt
+++ b/test/cppcheck_suppressions.txt
@@ -71,3 +71,7 @@ functionStatic:headers/modsecurity/transaction.h:374
 
 functionStatic:src/operators/geo_lookup.h:35
 useInitializationList:src/operators/rbl.h:69
+
+unmatchedSuppression:src/utils/geo_lookup.cc:82
+useInitializationList:src/utils/shared_files.h:87
+unmatchedSuppression:src/utils/msc_tree.cc