diff --git a/CMakeLists.txt b/CMakeLists.txt
index f795d772..31e39919 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -432,9 +432,10 @@ else()
 endif()
 
 message(STATUS "Summary of build options:
-    C compiler:       ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})
-    CXX compiler:     ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})
-    C_FLAGS:          ${CMAKE_C_FLAGS}
-    CXX_FLAGS:        ${CMAKE_CXX_FLAGS}
-    CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}
+    C compiler:         ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID})
+    CXX compiler:       ${CMAKE_CXX_COMPILER} (${CMAKE_CXX_COMPILER_ID})
+    CMAKE_BUILD_TYPE:   ${CMAKE_BUILD_TYPE}
+    C_FLAGS:            ${CMAKE_C_FLAGS}
+    CXX_FLAGS:          ${CMAKE_CXX_FLAGS}
+    OPTIMIZATION_FLAGS: ${OPTIMIZATION_FLAGS}
 ")
diff --git a/cmake/flags.cmake b/cmake/flags.cmake
index 00635fb8..80aa6fe1 100644
--- a/cmake/flags.cmake
+++ b/cmake/flags.cmake
@@ -114,13 +114,15 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
 	endif()
 
 	if (DEV_WITH_MSAN OR DEV_DEBUG OR (CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
-		add_definitions(-DDEBUG_BUILD)
+		if (NOT DEV_WITH_MSAN)
+			add_definitions(-DDEBUG_BUILD)
+		endif()
 		if (CMAKE_BUILD_TYPE STREQUAL "Debug")
 			set(OPTIMIZATION_FLAGS "-O0")
 		else()
 			set(OPTIMIZATION_FLAGS "-Og")
 		endif()
-		set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -g3 -ftrapv")
+		set(OPTIMIZATION_FLAGS "${OPTIMIZATION_FLAGS} -g -ftrapv")
 	else()
 		set(OPTIMIZATION_FLAGS "-O3 -ffast-math -funroll-loops -fmerge-all-constants")
 	endif()