diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0f50add..5cda51c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,11 +28,17 @@ endif()
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     if ($ENV{BUILD_SANITIZE})
         SET (CMAKE_EXE_LINKER_FLAGS
-            -fsanitize=address 
+            "-fsanitize=address"
+        )
+        SET (CMAKE_EXE_LINKER_FLAGS
+            "-fsanitize=undefined"
         )
         add_definitions(
-           -fsanitize=address 
+          "-fsanitize=address"  
         )
+        add_definitions(
+          "-fsanitize=undefined"  
+          )
     endif()
 else()
     add_definitions(-DNDEBUG)
diff --git a/libs/draw-lib/CMakeLists.txt b/libs/draw-lib/CMakeLists.txt
index f97ec543..e776064c 100644
--- a/libs/draw-lib/CMakeLists.txt
+++ b/libs/draw-lib/CMakeLists.txt
@@ -50,7 +50,6 @@ set(LINKEDDEPS
 	${OPENGL_gl_LIBRARY}
 	${SDLIMAGE_LIBRARY}
 	${SDL_LIBRARY}
-	${SDLMAIN_LIBRARY}
 	${FREETYPE_LIBRARIES}
 )
 
diff --git a/runtime/settings.yaml b/runtime/settings.yaml
index 74938d48..4aaf6d90 100644
--- a/runtime/settings.yaml
+++ b/runtime/settings.yaml
@@ -16,7 +16,7 @@ steps_per_draw: 2 #More is almost guaranteed to make the game faster, 1 is ideal
 free_memory_while_idle: no
 
 #Debug settings
-network_debug_mode: yes
+network_debug_mode: no
 invincible: no #Feel like exploring ? -> yes
 draw_diagnostics: no
 verbose_output: no
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 818c8c94..39f6eb66 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -117,7 +117,7 @@ set (libraries
 	${SDLMIXER_LIBRARY}
         enet
 	${SDL_LIBRARY}
-	${SDLMAIN_LIBRARY}
+        #	${SDLMAIN_LIBRARY}
 	${FREETYPE_LIBRARIES}
         UnitTest++
 )