diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f0ce39c..8f6e1226 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,6 @@ if (HAS_SSE4_1)
   add_compile_options(-msse3 -msse4.1)
 endif ()
 
-add_compile_definitions(SDL_MAIN_HANDLED)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug)
   add_compile_definitions(VULKAN_DEBUG)
   #add_compile_options(-fsanitize=address -fsanitize=undefined)
diff --git a/src/backend/core/mmio/Audio.hpp b/src/backend/core/mmio/Audio.hpp
index 177ab7cc..a29a0f8a 100644
--- a/src/backend/core/mmio/Audio.hpp
+++ b/src/backend/core/mmio/Audio.hpp
@@ -13,10 +13,12 @@ struct AudioDevice {
   void PushSample(float, float, float, float);
   void AdjustSampleRate(int);
   void LockMutex() {
-    SDL_LockMutex(audioStreamMutex);
+    if(audioStreamMutex)
+      SDL_LockMutex(audioStreamMutex);
   }
   void UnlockMutex() {
-    SDL_UnlockMutex(audioStreamMutex);
+    if (audioStreamMutex)
+      SDL_UnlockMutex(audioStreamMutex);
   }
 
   SDL_AudioStream* GetStream() { return audioStream; }
diff --git a/src/backend/core/mmio/PI.cpp b/src/backend/core/mmio/PI.cpp
index 7c0c761a..5828529f 100644
--- a/src/backend/core/mmio/PI.cpp
+++ b/src/backend/core/mmio/PI.cpp
@@ -468,7 +468,7 @@ void PI::Write(u32 addr, u32 val) {
 
       for(u32 i = 0; i < len; i++) {
         u32 addr = BYTE_ADDRESS(dramAddrInternal + i) & RDRAM_DSIZE;
-        if (addr < mem.mmio.rdp.rdram.size()) {
+        if (addr < RDRAM_SIZE) {
           mem.mmio.rdp.rdram[addr] = BusRead<u8, true>(cartAddrInternal + i);
         }
       }
diff --git a/src/frontend/CMakeLists.txt b/src/frontend/CMakeLists.txt
index 7f71407b..67245770 100644
--- a/src/frontend/CMakeLists.txt
+++ b/src/frontend/CMakeLists.txt
@@ -7,7 +7,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
 find_package(SDL2 CONFIG REQUIRED)
 
 include_directories(
-	${SDL2_INCLUDE_DIRS}
   .
   ../
   ../utils
@@ -33,6 +32,7 @@ include_directories(
   ../../external/imgui/imgui
   ../../external/imgui/imgui/backends
   ../../external/unarr
+  ${SDL2_INCLUDE_DIRS}
 )
 
 option(RAPIDJSON_BUILD_DOC "Build rapidjson documentation." OFF)
@@ -73,6 +73,7 @@ add_executable(kaizen-qt
   InputSettings.cpp)
 
 target_link_libraries(kaizen-qt PUBLIC Qt6::Core Qt6::Gui Qt6::Widgets fmt mio nlohmann_json nfd parallel-rdp backend)
+target_compile_definitions(kaizen-qt PUBLIC SDL_MAIN_HANDLED)
 
 file(COPY ../../resources/ DESTINATION ${PROJECT_BINARY_DIR}/resources/)
 file(REMOVE