diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8e248da..07a7ff78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ option(ISLE_BUILD_APP "Build isle application" ON)
 option(ISLE_ASAN "Enable Address Sanitizer" OFF)
 option(ISLE_UBSAN "Enable Undefined Behavior Sanitizer" OFF)
 option(ISLE_WERROR "Treat warnings as errors" OFF)
-option(ISLE_DEBUG "Enable imgui debug" ON)
+cmake_dependent_option(ISLE_DEBUG "Enable imgui debug" ON "NOT NXDK" OFF)
 cmake_dependent_option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" "${NOT_MINGW}" "WIN32;CMAKE_SIZEOF_VOID_P EQUAL 4" OFF)
 cmake_dependent_option(ISLE_MINIWIN "Use miniwin" ON "NOT ISLE_USE_DX5" OFF)
 cmake_dependent_option(ISLE_EXTENSIONS "Use extensions" ON "NOT ISLE_USE_DX5" OFF)
@@ -186,7 +186,9 @@ target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/L
 target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include>")
 target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include/actions>")
 target_link_libraries(lego1 PRIVATE SDL3::SDL3)
-if (!NXDK) # Dunno why, but Ryzee's SDL3 doesn't like "SDL3::Headers"
+if (NXDK) # Dunno why, but Ryzee's SDL3 doesn't like "SDL3::Headers"
+  target_link_libraries(lego1 PUBLIC SDL3)
+else()
   target_link_libraries(lego1 PUBLIC SDL3::Headers)
 endif()
 target_link_libraries(lego1 PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DirectX5::DirectX5>)
diff --git a/miniwin/CMakeLists.txt b/miniwin/CMakeLists.txt
index 18acbbf3..1afd156b 100644
--- a/miniwin/CMakeLists.txt
+++ b/miniwin/CMakeLists.txt
@@ -111,13 +111,8 @@ target_include_directories(miniwin
 )
 target_link_libraries(miniwin PUBLIC miniwin-headers)
 
-if (NXDK)
-  target_link_libraries(miniwin PRIVATE ${NXDK_DIR}/lib/libpbkit.lib)
-  target_link_libraries(miniwin PRIVATE ${NXDK_DIR}/lib/libSDL3.lib)
-  target_include_directories(miniwin PRIVATE ${NXDK_DIR}/lib/sdl/SDL3/include)
-else()
-  target_link_libraries(miniwin PRIVATE SDL3::SDL3)
-endif()
+
+target_link_libraries(miniwin PRIVATE SDL3::SDL3)
 
 target_compile_definitions(miniwin PUBLIC ${GRAPHICS_BACKENDS})
 
diff --git a/miniwin/src/d3drm/backends/software/renderer.cpp b/miniwin/src/d3drm/backends/software/renderer.cpp
index 93a80a2e..18b31a14 100644
--- a/miniwin/src/d3drm/backends/software/renderer.cpp
+++ b/miniwin/src/d3drm/backends/software/renderer.cpp
@@ -71,7 +71,7 @@ void Direct3DRMSoftwareRenderer::ClearZBuffer()
 			_mm_storeu_ps(&m_zBuffer[i], inf4);
 		}
 	}
-#if defined(__i386__) || defined(_M_IX86)
+#if (defined(__i386__) || defined(_M_IX86)) && !defined(NXDK)
 	else if (SDL_HasMMX()) {
 		const __m64 mm_inf = _mm_set_pi32(0x7F800000, 0x7F800000);
 		for (; i + 2 <= size; i += 2) {