diff --git a/cmake/ModSDK.cmake b/cmake/ModSDK.cmake
index c320dcb5f4..c4fc1f560d 100644
--- a/cmake/ModSDK.cmake
+++ b/cmake/ModSDK.cmake
@@ -64,6 +64,9 @@ function(add_mod target_name)
             WINDOWS_EXPORT_ALL_SYMBOLS OFF)
     target_compile_features(${target_name} PRIVATE cxx_std_20)
     target_link_libraries(${target_name} PRIVATE dusklight_game_headers)
+    if (TARGET dawn::webgpu_dawn)
+        target_link_libraries(${target_name} PRIVATE dawn::webgpu_dawn)
+    endif ()
 
     if (NOT TARGET dusklight)
         # Apply global compile options for out-of-tree mod builds
@@ -255,6 +258,9 @@ function(install_bundled_mods)
                 install(DIRECTORY "${_stage}/" DESTINATION "${_bundle_dir}/Contents/Resources/mods/${_id}")
                 install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - \"${_bundle_dir}/Contents/Resources/mods/${_id}/${_lib_name}\" COMMAND_ERROR_IS_FATAL ANY)")
             endforeach ()
+            if (TARGET crashpad_handler)
+                install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - \"${_bundle_dir}/Contents/MacOS/$<TARGET_FILE_NAME:crashpad_handler>\" COMMAND_ERROR_IS_FATAL ANY)")
+            endif ()
             install(CODE "execute_process(COMMAND /usr/bin/codesign --force --sign - --entitlements \"${DUSK_ENTITLEMENTS}\" \"${_bundle_dir}\" COMMAND_ERROR_IS_FATAL ANY)")
         endif ()
         return ()
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index b66c1ee8e8..562b4ce33e 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -1049,7 +1049,7 @@ public:
 
 STATIC_ASSERT(122384 == sizeof(dComIfG_inf_c));
 
-extern dComIfG_inf_c g_dComIfG_gameInfo;
+DUSK_GAME_EXTERN dComIfG_inf_c g_dComIfG_gameInfo;
 extern GXColor g_blackColor;
 extern GXColor g_clearColor;
 extern GXColor g_whiteColor;
diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h
index 06c8f0eb56..fb3d0435b0 100644
--- a/include/d/d_kankyo.h
+++ b/include/d/d_kankyo.h
@@ -471,7 +471,7 @@ public:
     /* 0x130C */ u8 staffroll_next_timer;
 };  // Size: 0x1310
 
-extern dScnKy_env_light_c g_env_light;
+DUSK_GAME_EXTERN dScnKy_env_light_c g_env_light;
 
 STATIC_ASSERT(sizeof(dScnKy_env_light_c) == 4880);
 
diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h
index 28cb9f7fe6..ea13c0600c 100644
--- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h
@@ -5,6 +5,7 @@
 #include "JSystem/J3DAssert.h"
 #include "JSystem/J3DGraphBase/J3DFifo.h"
 #include "JSystem/JMath/JMath.h"
+#include "global.h"
 #include <mtx.h>
 #include "dusk/endian_gx.hpp"
 
@@ -203,7 +204,7 @@ public:
 
     static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }
 
-    static void* sOldVcdVatCmd;
+    static DUSK_GAME_DATA void* sOldVcdVatCmd;
     static bool sEnvelopeFlag;
 
 private:
diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h
index 8c4bbd06e3..ddc961f73f 100644
--- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h
@@ -8,6 +8,7 @@
 #include "JSystem/JMath/JMath.h"
 #include "dusk/frame_interpolation.h"
 #include "dusk/endian.h"
+#include "global.h"
 
 enum J3DSysDrawBuf {
     /* 0x0 */ J3DSysDrawBuf_Opa,
@@ -208,6 +209,6 @@ struct J3DSys {
 };
 
 extern u32 j3dDefaultViewNo;
-extern J3DSys j3dSys;
+DUSK_GAME_EXTERN J3DSys j3dSys;
 
 #endif /* J3DSYS_H */