diff --git a/Makefile b/Makefile
index 67af298..e66da36 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ valgrind:
 .PHONY : valgrind
 
 lldb:
-	@true @$(eval DEBUGGER = lldb -o "breakpoint set -n cereal::RapidJSONException -n std::out_of_range" -o "r")
+	@true @$(eval DEBUGGER = lldb -o "breakpoint set -n cereal::RapidJSONException -n std::out_of_range -n std::runtime_error" -o "r")
 	@true @$(eval PARAMS = --nothrow)
 .PHONY : lldb
 
@@ -20,7 +20,7 @@ mkdir:
 .PHONY : mkdir
 
 cmake: mkdir
-	@cd $(BUILD_DIR) && cmake ..
+	@cd $(BUILD_DIR) && cmake -DCMAKE_BUILD_TYPE=Debug ..
 .PHONY : cmake
 
 compile:
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index 34d982e..038a69f 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -99,9 +99,11 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 include_directories(SYSTEM ${LIB_HEADER_DIRS})
 include_directories(${HEADER_DIRS})
 
-set(CMAKE_BUILD_TYPE Debug)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
+
 add_library(SymmetryEngine STATIC ${SRCS})
 
 target_include_directories(SymmetryEngine SYSTEM PUBLIC ${CPM_INCLUDE_DIRS})
diff --git a/engine/test/CMakeLists.txt b/engine/test/CMakeLists.txt
index 4dccbdd..ae7d1bd 100644
--- a/engine/test/CMakeLists.txt
+++ b/engine/test/CMakeLists.txt
@@ -14,6 +14,8 @@ ENDMACRO()
 set(CMAKE_BUILD_TYPE Debug)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
 
 if (NOT TARGET SymmetryEngine)
     add_subdirectory(".." "${CMAKE_CURRENT_BINARY_DIR}/engine")