diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fd79f34..51bc4561 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,7 +148,7 @@ endif ()
 
 
 add_library(dol SHARED ${DOLPHIN_FILES} ${GAME_FILES} ${PORT_FILES})
-target_compile_definitions(dol PRIVATE TARGET_PC AVOID_UB NON_MATCHING TARGET_DOL VERSION=${VERSION} MUSY_VERSION_MAJOR=1 MUSY_VERSION_MINOR=5 MUSY_VERSION_PATCH=4)
+target_compile_definitions(dol PRIVATE TARGET_PC NON_MATCHING TARGET_DOL VERSION=${VERSION} MUSY_VERSION_MAJOR=1 MUSY_VERSION_MINOR=5 MUSY_VERSION_PATCH=4)
 target_include_directories(dol PRIVATE include build/GMPE01_00/include)
 target_link_libraries(dol PRIVATE aurora::core aurora::gx aurora::si aurora::vi aurora::pad musyx)
 if (MSVC)
@@ -164,7 +164,7 @@ else ()
 endif ()
 
 add_executable(marioparty4 src/port/portmain.c)
-target_compile_definitions(marioparty4 PRIVATE TARGET_PC AVOID_UB NON_MATCHING VERSION=${VERSION})
+target_compile_definitions(marioparty4 PRIVATE TARGET_PC NON_MATCHING VERSION=${VERSION})
 target_include_directories(marioparty4 PRIVATE include)
 target_link_libraries(marioparty4 PRIVATE dol aurora::main)
 
@@ -183,7 +183,7 @@ foreach (dir ${REL_DIRS})
             if (dir MATCHES "^w..Dll")
                 target_sources(${dir} PRIVATE src/REL/board_executor.c)
             endif()
-            target_compile_definitions(${dir} PRIVATE TARGET_PC AVOID_UB NON_MATCHING VERSION=${VERSION})
+            target_compile_definitions(${dir} PRIVATE TARGET_PC NON_MATCHING VERSION=${VERSION})
             target_include_directories(${dir} PRIVATE include build/GMPE01_00/include)
             if (MSVC)
                 set_target_properties(${dir} PROPERTIES LINK_FLAGS "/EXPORT:ObjectSetup")
diff --git a/src/REL/modeseldll/modesel.c b/src/REL/modeseldll/modesel.c
index ff96fbbc..42f3d771 100644
--- a/src/REL/modeseldll/modesel.c
+++ b/src/REL/modeseldll/modesel.c
@@ -173,10 +173,13 @@ s32 fn_1_2490(void)
     HuWinExAnimOut(lbl_1_bss_82);
     HuAudFXStop(temp_r25);
     temp_r27 = HuSprGrpCreate(1);
+#ifdef __MWERKS__
+    // TODO PC
     temp_r21 = HuTHPSprCreateVol("movie/opmov_c00.thp", 0, 3000, 90.0);
     HuSprGrpMemberSet(temp_r27, 0, temp_r21);
     HuSprPosSet(temp_r27, 0, 288.0f, 240.0f);
     HuSprDrawNoSet(temp_r27, 0, 127);
+#endif
     HuPrcSleep(2);
     espAttrSet(lbl_1_bss_152[9], HUSPR_ATTR_DISPOFF);
     for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) {
diff --git a/src/game/ClusterExec.c b/src/game/ClusterExec.c
index c7f96a3e..e06e7eaa 100644
--- a/src/game/ClusterExec.c
+++ b/src/game/ClusterExec.c
@@ -154,9 +154,7 @@ void ClusterMotionExec(ModelData *arg0)
     HsfTrack *var_r30;
     MotionData *var_r23;
 
-#ifdef AVOID_UB
-    //var_r31 = temp_r27->track;
-#else
+#ifndef NON_MATCHING
     var_r31 = temp_r27->track;
 #endif
     for (i = 0; i < 4; i++) {
diff --git a/src/game/hsfload.c b/src/game/hsfload.c
index 4d830854..c5eebe8b 100644
--- a/src/game/hsfload.c
+++ b/src/game/hsfload.c
@@ -1908,7 +1908,7 @@ void KillHSF(HsfData *data)
     for (i = 0; i < data->motionCnt; i++) {
         HsfMotion *motion = &data->motion[i];
         for (j = 0; j < motion->numTracks; j++) {
-            HsfTrack *track = data->motion[i].track;
+            HsfTrack *track = motion->track;
             if (track->type == HSF_TRACK_ATTRIBUTE && track->curveType == HSF_CURVE_BITMAP) {
                 // in this case we needed to allocate space for HsfBitmapKey structs
                 HuMemDirectFree(track->dataTop);
diff --git a/src/game/sprman.c b/src/game/sprman.c
index 2e0385aa..d685c795 100644
--- a/src/game/sprman.c
+++ b/src/game/sprman.c
@@ -3,9 +3,11 @@
 #include "game/init.h"
 
 #include "dolphin/mtx.h"
-#include <stdint.h>
 
 #include "port/byteswap.h"
+#ifndef __MWERKS__
+#include "game/hsfdraw.h"
+#endif
 
 #define SPRITE_DIRTY_ATTR 0x1
 #define SPRITE_DIRTY_XFORM 0x2