diff --git a/src/REL/m407dll/camera.c b/src/REL/m407dll/camera.c
index 823241ad..a9f09888 100644
--- a/src/REL/m407dll/camera.c
+++ b/src/REL/m407dll/camera.c
@@ -38,7 +38,7 @@ void fn_1_1B1C(Process* arg0) {
     Hu3DCameraPerspectiveSet(1, 45.0f, 10.0f, 40000.0f, 1.2f);
     lbl_1_bss_30 = omAddObjEx(lbl_1_bss_34, 0x80, 0, 0, -1, fn_1_2024);
     lbl_1_bss_30->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData2), MEMORY_DEFAULT_NUM);
-    unkData = OM_GET_DATA_PTR(lbl_1_bss_30, unkDominationData2);
+    unkData = lbl_1_bss_30->data;
     unkData->unk_04 = 0;
     fn_1_1CAC(0.0f, 0.0f, 0.0f);
     fn_1_1D08(0.0f, 0.0f, 0.0f);
@@ -82,14 +82,14 @@ void fn_1_1D74(f32* arg0) {
 }
 
 s32 fn_1_1D88(void) {
-    unkDominationData2* unkData = OM_GET_DATA_PTR(lbl_1_bss_30, unkDominationData2);
+    unkDominationData2* unkData = lbl_1_bss_30->data;
     return unkData->unk_04;
 }
 
 void fn_1_1DB0(Point3d* arg0, Point3d* arg1, f32* arg2, s32 arg3, s32 arg4) {
     unkDominationData2* temp_r31;
 
-    temp_r31 = OM_GET_DATA_PTR(lbl_1_bss_30, unkDominationData2);
+    temp_r31 = lbl_1_bss_30->data;
     temp_r31->unk_00 = arg4;
     temp_r31->unk_08 = (arg0) ? *arg0 : Center;
     temp_r31->unk_14 = (arg1) ? *arg1 : CRot;
@@ -118,7 +118,7 @@ void fn_1_2024(omObjData* arg0) {
     f32 cZoomTemp;
     unkDominationData2* temp_r31;
 
-    temp_r31 = OM_GET_DATA_PTR(arg0, unkDominationData2);
+    temp_r31 = arg0->data;
     if (temp_r31->unk_04 != 0) {
         switch (temp_r31->unk_00) {
         case 0:
diff --git a/src/REL/m407dll/map.c b/src/REL/m407dll/map.c
index cffd6090..91d7f946 100644
--- a/src/REL/m407dll/map.c
+++ b/src/REL/m407dll/map.c
@@ -50,7 +50,7 @@ void fn_1_14F0(Process* arg0, s32 arg1) {
     lbl_1_bss_2C = arg0;
     lbl_1_bss_20 = arg1;
     lbl_1_bss_28 = omAddObjEx(lbl_1_bss_2C, 0x100, 0xD, 0, 1, fn_1_162C);
-    omSetStatBit(lbl_1_bss_28, 0x100U);
+    omSetStatBit(lbl_1_bss_28, 0x100);
     Hu3DLighInit();
     lbl_1_bss_24 = Hu3DGLightCreateV(&lbl_1_data_1FC, &lbl_1_data_208, &lbl_1_data_214);
     Hu3DGLightInfinitytSet(lbl_1_bss_24);
@@ -78,7 +78,7 @@ void fn_1_162C(omObjData* arg0) {
     Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
     arg0->model[1] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_198[3], MEMORY_DEFAULT_NUM, HEAP_DATA));
     Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f);
-    Hu3DModelAttrSet(arg0->model[1], 1U);
+    Hu3DModelAttrSet(arg0->model[1], 1);
     for (i = 0; i < ARRAY_COUNT(GWPlayerCfg); i++) {
         arg0->model[i+2] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_198[GWPlayerCfg[i].character + 4], MEMORY_DEFAULT_NUM, HEAP_DATA));
         Hu3DModelAmbSet(arg0->model[i + 2], 1.0f, 1.0f, 1.0f);
diff --git a/src/REL/m407dll/player.c b/src/REL/m407dll/player.c
index 2fc496c5..48338112 100644
--- a/src/REL/m407dll/player.c
+++ b/src/REL/m407dll/player.c
@@ -225,13 +225,13 @@ s32 fn_1_508(u8 arg0) {
 }
 
 s32 fn_1_53C(u8 arg0) {
-    return OM_GET_DATA_PTR(lbl_1_bss_8[arg0], unkDominationData)->unk_1C == 0;
+    return ((unkDominationData*)(lbl_1_bss_8[arg0]->data))->unk_1C == 0;
 }
 
 void fn_1_568(s16 arg0, s16 arg1, s16 arg2) {
     unkDominationData* unkData;
 
-    unkData = OM_GET_DATA_PTR(lbl_1_bss_8[arg0], unkDominationData);
+    unkData = lbl_1_bss_8[arg0]->data;
     switch (arg1) {
     case 0:
         omVibrate(unkData->unk_00, arg2, 6, 6);
@@ -248,7 +248,7 @@ void fn_1_568(s16 arg0, s16 arg1, s16 arg2) {
 void fn_1_628(omObjData* arg0, s32 arg1) {
     unkDominationData* temp_r31;
 
-    temp_r31 = OM_GET_DATA_PTR(arg0, unkDominationData);
+    temp_r31 = arg0->data;
     temp_r31->unk_1C = arg1;
     temp_r31->unk_20 = 0;
 }
@@ -327,7 +327,7 @@ void fn_1_A8C(omObjData* arg0) {
     unkDominationData* temp_r31;
 
     var_r29 = 0;
-    temp_r31 = OM_GET_DATA_PTR(arg0, unkDominationData);
+    temp_r31 = arg0->data;
     temp_r31->unk_28 += 1.0f;
     
     if (temp_r31->unk_04 == 0) {
@@ -339,7 +339,7 @@ void fn_1_A8C(omObjData* arg0) {
     
     if (var_r29 != 0) {
         CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[2], 0.0f, 0.0f, 0);
-        fn_1_4544(4, 0x10, 600.0f - (400.0f * (f32) temp_r31->unk_00), -20.0f, -450.0f);
+        fn_1_4544(4, 0x10, 600.0f - (400.0f * temp_r31->unk_00), -20.0f, -450.0f);
         fn_1_26CC(temp_r31->unk_00);
         temp_r31->unk_34 = 1;
         return;
@@ -367,7 +367,7 @@ void fn_1_CF4(omObjData* arg0) {
 
     temp_r31 = arg0->data;
     if (temp_r31->unk_20 == 0) {
-        CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[1], 0.0f, 10.0f, 0x40000001U);
+        CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[1], 0.0f, 10.0f, 0x40000001);
         CharModelItemHookCreate(temp_r31->unk_01, lbl_1_data_13C[temp_r31->unk_01]);
     }
     if (temp_r31->unk_20++ >= 30) {
diff --git a/src/REL/m407dll/whomp_score.c b/src/REL/m407dll/whomp_score.c
index cdbf0fb9..5d024e6f 100644
--- a/src/REL/m407dll/whomp_score.c
+++ b/src/REL/m407dll/whomp_score.c
@@ -61,7 +61,7 @@ void fn_1_3BB8(s16 arg0, f32 arg8, f32 arg9) {
 
     for (i = 0; i < ARRAY_COUNT(lbl_1_bss_37C8); i++) {
         obj = lbl_1_bss_37C8[i];
-        temp_r31 = OM_GET_DATA_PTR(obj, unkDominationData3);
+        temp_r31 = obj->data;
         if (temp_r31->unk_04 == 0) {
             temp = arg0;
             espBankSet(temp_r31->unk_18[1], (temp / 100));