diff --git a/src/main.cpp b/src/main.cpp
index ba5a7e1..6dd27e0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -115,8 +115,11 @@ static bool discover_historical_crashes(const std::string& log_file_path,
 #endif
 static bool process_config(const char* config_file_path, std::vector<std::shared_ptr<TestSuite>>& test_suites);
 
+extern "C" __cdecl int automount_d_drive(void);
+
 /* Main program function */
 int main() {
+  automount_d_drive();
   XVideoSetMode(kFramebufferWidth, kFramebufferHeight, 32, REFRESH_DEFAULT);
 
   // Reserve 4 times the size of the default framebuffers to allow for antialiasing.
diff --git a/src/tests/texture_cubemap_tests.cpp b/src/tests/texture_cubemap_tests.cpp
index 943fdd2..8372896 100644
--- a/src/tests/texture_cubemap_tests.cpp
+++ b/src/tests/texture_cubemap_tests.cpp
@@ -253,7 +253,7 @@ void TextureCubemapTests::TestDotSTRCubemap(const std::string &name, uint32_t do
     MatrixTranslate(model_matrix, translation);
 
     matrix4_t mv_matrix;
-    MatrixMultMatrix(matrix, model_matrix, mv_matrix);
+    MatrixMultMatrix(model_matrix, matrix, mv_matrix);
     host_.SetFixedFunctionModelViewMatrix(mv_matrix);
 
     auto inv_projection = host_.GetFixedFunctionInverseCompositeMatrix();
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index f23c798..92a1c20 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -73,4 +73,26 @@ if (NOT NO_OPT)
             -Wno-everything
     )
     target_link_options(xbox_math3d PRIVATE "/debug:none")
+else ()
+    if (CMAKE_BUILD_TYPE MATCHES Debug)
+        target_compile_options(
+                xbox_math3d
+                PRIVATE
+                -g
+                -gdwarf-4
+                -O0
+                -Wall
+                -fstandalone-debug
+        )
+        target_link_options(xbox_math3d PRIVATE "/debug:full")
+    else ()
+        target_compile_options(
+                xbox_math3d
+                PRIVATE
+                -O3
+                -fno-strict-aliasing
+                -Wall
+        )
+        target_link_options(xbox_math3d PRIVATE "/debug:none")
+    endif ()
 endif ()