diff --git a/CMakeLists.txt b/CMakeLists.txt
index 736602f..fe8579e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE(scripts/FindSSE.cmake)
 FindSSE()
 
 # Set compile flags
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_C_COMPILER /usr/local/bin/clang)
 set(CMAKE_CXX_COMPILER /usr/local/bin/clang++)
 #set(CMAKE_CXX_CLANG_TIDY "clang-tidy;--extra-arg-before=-std=c++17 --system-headers=0")
@@ -14,7 +14,7 @@ set(CMAKE_CXX_FLAGS "-pedantic -Wall -Wextra  \
  -Wno-invalid-offsetof -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization \
  -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Woverloaded-virtual \
  -Wredundant-decls -Wsign-promo -Wstrict-overflow=5 -Wswitch-default -Wundef  \
- -Wno-unused -Wold-style-cast -Wno-uninitialized")
+ -Wno-unused -Wold-style-cast -Wno-uninitialized -fPIC")
 
 # Set compile flag for x86_64
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
@@ -27,8 +27,8 @@ IF(SSE4_2_FOUND)
 ENDIF(SSE4_2_FOUND)
 
 set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-#set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -DNDEBUG -flto ")
-set(CMAKE_CXX_FLAGS_RELEASE "-O2 -g -fno-aligned-new -ffunction-sections -fno-strict-aliasing -m64 -mcmodel=large -MMD -MP -MT -lnuma -D_GLIBCXX_ATOMIC_BUILTINS_8 -fno-builtin-sin -fno-builtin-cos -fno-builtin-sinf -fno-builtin-cosf -D__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 -D_GLIBCXX_NO_OBSOLETE_ISINF_ISNAN_DYNAMIC -D__FreeBSD__=12 -T /home/mml/caladan/base/base.ld -L/home/mml/caladan -L/home/mml/caladan/bindings/cc")
+set(CMAKE_CXX_FLAGS_RELEASE " -fPIC -stdlib=libstdc++ -O2 -g -DNDEBUG -ffunction-sections -fno-strict-aliasing -m64 -mcmodel=large -MMD -MP  -T /home/mml/caladan/base/base.ld -L/home/mml/caladan -L/home/mml/caladan/bindings/cc")
+#set(CMAKE_CXX_FLAGS_RELEASE "-O2 -g -ffunction-sections -fno-strict-aliasing -m64 -mcmodel=large -MMD -MP -MT -T /home/mml/caladan/base/base.ld -L/home/mml/caladan -L/home/mml/caladan/bindings/cc")
 set(CMAKE_BUILD_TYPE RELEASE)
 
 # Directories for output binaries and libraries