diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76e6f85ab..06fea7450 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ set(PROJECT_HOMEPAGE_URL "https://www.fein-aachen.org/projects/villas-node/")
 
 # Several CMake settings/defaults
 set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_THREAD_PREFER_PTHREAD ON)
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake;${PROJECT_SOURCE_DIR}/common/cmake")
 
diff --git a/common b/common
index 581a9b192..84c6f87f6 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 581a9b192f5b430384633c97b3efec3eaccffffd
+Subproject commit 84c6f87f6f4c7ab0799161e05576e871dc045a9e