diff --git a/cmake/compiler_flags.cmake b/cmake/compiler_flags.cmake
index 12d377c3b..5a3192ed1 100644
--- a/cmake/compiler_flags.cmake
+++ b/cmake/compiler_flags.cmake
@@ -37,8 +37,14 @@ string(REPLACE -D_GLIBCXX_DEBUG "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG
 string(REPLACE -D_GLIBCXX_ASSERTIONS "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
 # } end hacks
 
+if(WITH_COLUMNSTORE_ASAN)
+    set(WERROR_FLAG)
+else()
+    set(WERROR_FLAG -Werror)
+endif()
+
 # Maintainer flags, works when build is done via bootstrap_mcs.sh {
-set(COLUMNSTORE_MAINTAINER_FLAGS -Werror)
+set(COLUMNSTORE_MAINTAINER_FLAGS ${WERROR_FLAG})
 # } end Maintainer flags
 
 # Release, Debug and common flags {
diff --git a/dbcon/execplan/CMakeLists.txt b/dbcon/execplan/CMakeLists.txt
index 8faee6a32..bc00e368c 100755
--- a/dbcon/execplan/CMakeLists.txt
+++ b/dbcon/execplan/CMakeLists.txt
@@ -49,7 +49,7 @@ columnstore_library(execplan ${execplan_LIB_SRCS})
 
 add_dependencies(execplan loggingcpp)
 
-target_link_libraries(execplan messageqcpp ${NETSNMP_LIBRARIES} ${MARIADB_STRING_LIBS} ${ENGINE_DT_LIB} pron)
+target_link_libraries(execplan messageqcpp ${NETSNMP_LIBRARIES} ${ENGINE_DT_LIB} pron)
 
 install(
     TARGETS execplan