diff --git a/storage-manager/CMakeLists.txt b/storage-manager/CMakeLists.txt
index b89012804..c72171cbd 100755
--- a/storage-manager/CMakeLists.txt
+++ b/storage-manager/CMakeLists.txt
@@ -82,7 +82,6 @@ target_include_directories(storagemanager PRIVATE ${Boost_INCLUDE_DIRS})
 
 columnstore_executable(StorageManager src/main.cpp)
 columnstore_link(StorageManager storagemanager)
-set_property(TARGET StorageManager PROPERTY CXX_STANDARD 20)
 
 set(TMPDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/storage-manager/src/S3Storage.h b/storage-manager/src/S3Storage.h
index df63afc5b..4b50e5854 100644
--- a/storage-manager/src/S3Storage.h
+++ b/storage-manager/src/S3Storage.h
@@ -19,12 +19,12 @@
 
 #include <deque>
 #include <string>
-#include <map>
 #include <memory>
 #include <optional>
+#include <unordered_map>
+
 #include "CloudStorage.h"
 #include "libmarias3/marias3.h"
-#include "Config.h"
 #include <curl/curl.h>
 
 namespace storagemanager
diff --git a/utils/regr/modamysql.cpp b/utils/regr/modamysql.cpp
index 3d8434be4..c3f5ba4d5 100644
--- a/utils/regr/modamysql.cpp
+++ b/utils/regr/modamysql.cpp
@@ -1,14 +1,7 @@
 #include <my_config.h>
 #include <cmath>
-#include <iostream>
-#include <sstream>
 #include <string.h>
 #include <unordered_map>
-#include <algorithm>
-#include <sstream>
-#include <iostream>
-#include <charconv>
-#include "boost/lexical_cast.hpp"
 #include "idb_mysql.h"
 
 namespace
diff --git a/writeengine/bulk/we_cmdargs.cpp b/writeengine/bulk/we_cmdargs.cpp
index f0e91d664..7d811dfaf 100644
--- a/writeengine/bulk/we_cmdargs.cpp
+++ b/writeengine/bulk/we_cmdargs.cpp
@@ -303,7 +303,7 @@ void WECmdArgs::parseCmdLineArgs(int argc, char** argv)
       fAllowMissingColumn = true;
     }
   }
-  if (vm.contains("max-errors"))
+  if (vm.count("max-errors"))
   {
     auto optarg= vm["max-errors"].as<string>();
     if (optarg == "all")
diff --git a/writeengine/splitter/we_cmdargs.cpp b/writeengine/splitter/we_cmdargs.cpp
index ffdfcf285..dbf2166a0 100644
--- a/writeengine/splitter/we_cmdargs.cpp
+++ b/writeengine/splitter/we_cmdargs.cpp
@@ -736,7 +736,7 @@ void WECmdArgs::parseCmdLineArgs(int argc, char** argv)
       fBatchQty = 10000;
     }
   }
-  if (vm.contains("max-errors"))
+  if (vm.count("max-errors"))
   {
     auto optarg = vm["max-errors"].as<string>();
     if (optarg == "all")