diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e6ad4132..b8179df47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,6 +224,9 @@ IF (MASK_LONGDOUBLE)
 ENDIF()
 
 
+MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-copy" DEBUG RELEASE RELWITHDEBINFO MINSIZEREL)
+MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-declarations" DEBUG RELEASE RELWITHDEBINFO MINSIZEREL)
+
 SET (CMAKE_REQUIRED_FLAGS "-Werror -Wall")
 SET (ENGINE_LDFLAGS    "-Wl,--no-as-needed -Wl,--add-needed")
 SET (ENGINE_DT_LIB datatypes)
diff --git a/VERSION b/VERSION
index fb113a00c..2ffaf52f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
 COLUMNSTORE_VERSION_MAJOR=6
 COLUMNSTORE_VERSION_MINOR=4
-COLUMNSTORE_VERSION_PATCH=8
-COLUMNSTORE_VERSION_RELEASE=2
+COLUMNSTORE_VERSION_PATCH=9
+COLUMNSTORE_VERSION_PATCH=1
diff --git a/dbcon/mysql/ha_mcs_impl_if.h b/dbcon/mysql/ha_mcs_impl_if.h
index 400669767..037b25983 100644
--- a/dbcon/mysql/ha_mcs_impl_if.h
+++ b/dbcon/mysql/ha_mcs_impl_if.h
@@ -30,6 +30,7 @@
 #include <boost/shared_ptr.hpp>
 #include <stack>
 #include <vector>
+#include <bitset>
 
 #include "idb_mysql.h"
 #include "ha_mcs_sysvars.h"
diff --git a/storage-manager/src/MetadataFile.cpp b/storage-manager/src/MetadataFile.cpp
index e45c95173..fb9473645 100644
--- a/storage-manager/src/MetadataFile.cpp
+++ b/storage-manager/src/MetadataFile.cpp
@@ -28,6 +28,7 @@
 #include <boost/uuid/uuid_io.hpp>
 #include <boost/uuid/random_generator.hpp>
 #include <unistd.h>
+#include <set>
 
 #define max(x, y) (x > y ? x : y)
 #define min(x, y) (x < y ? x : y)
diff --git a/storage-manager/src/Ownership.cpp b/storage-manager/src/Ownership.cpp
index cadcebc22..3c86503e1 100644
--- a/storage-manager/src/Ownership.cpp
+++ b/storage-manager/src/Ownership.cpp
@@ -77,7 +77,7 @@ bf::path Ownership::get(const bf::path& p, bool getOwnership)
   bf::path::const_iterator pit;
   int i, levels;
 
-  normalizedPath.normalize();
+  normalizedPath.lexically_normal();
   // cerr << "Ownership::get() param = " << normalizedPath.string() << endl;
   if (prefixDepth > 0)
   {
diff --git a/storage-manager/src/S3Storage.h b/storage-manager/src/S3Storage.h
index a7ff7a441..88ffbeabd 100644
--- a/storage-manager/src/S3Storage.h
+++ b/storage-manager/src/S3Storage.h
@@ -25,6 +25,7 @@
 #include "libmarias3/marias3.h"
 #include "Config.h"
 #include <curl/curl.h>
+#include <deque>
 
 namespace storagemanager
 {
diff --git a/tools/passwd/secrets.cpp b/tools/passwd/secrets.cpp
index f4c1d80cf..65fd3dcaf 100644
--- a/tools/passwd/secrets.cpp
+++ b/tools/passwd/secrets.cpp
@@ -32,6 +32,7 @@
 #include "exceptclasses.h"
 #include "columnstoreversion.h"
 #include "vlarray.h"
+#include <array>
 
 using std::string;
 
diff --git a/utils/cloudio/SocketPool.h b/utils/cloudio/SocketPool.h
index 7e1bc9400..4c6f731df 100644
--- a/utils/cloudio/SocketPool.h
+++ b/utils/cloudio/SocketPool.h
@@ -23,6 +23,7 @@
 #include <boost/thread/condition_variable.hpp>
 
 #include "bytestream.h"
+#include <deque>
 
 namespace idbdatafile
 {
diff --git a/utils/funcexp/func_between.cpp b/utils/funcexp/func_between.cpp
index 657123635..8f570c327 100644
--- a/utils/funcexp/func_between.cpp
+++ b/utils/funcexp/func_between.cpp
@@ -243,19 +243,19 @@ inline bool getBool(rowgroup::Row& row, funcexp::FunctionParm& pm, bool& isNull,
     case execplan::CalpontSystemCatalog::TEXT:
     {
       const string& val = pm[0]->data()->getStrVal(row, isNull);
-      CHARSET_INFO& cs = datatypes::Charset(ct.charsetNumber).getCharset();
+      CHARSET_INFO *cs = &datatypes::Charset(ct.charsetNumber).getCharset();
 
       if (notBetween)
       {
-        if (!strGE(cs, val, pm[1]->data()->getStrVal(row, isNull)) && !isNull)
+        if (!strGE(*cs, val, pm[1]->data()->getStrVal(row, isNull)) && !isNull)
           return true;
 
         isNull = false;
-        return (!strLE(cs, val, pm[2]->data()->getStrVal(row, isNull)) && !isNull);
+        return (!strLE(*cs, val, pm[2]->data()->getStrVal(row, isNull)) && !isNull);
       }
 
-      return !isNull && strGE(cs, val, pm[1]->data()->getStrVal(row, isNull)) &&
-             strLE(cs, val, pm[2]->data()->getStrVal(row, isNull));
+      return !isNull && strGE(*cs, val, pm[1]->data()->getStrVal(row, isNull)) &&
+             strLE(*cs, val, pm[2]->data()->getStrVal(row, isNull));
     }
 
     default: