diff --git a/courses/koopa_troopa_beach/course_offsets.c b/courses/koopa_troopa_beach/course_offsets.c
index 0852bb7d4..18ffb89c7 100644
--- a/courses/koopa_troopa_beach/course_offsets.c
+++ b/courses/koopa_troopa_beach/course_offsets.c
@@ -459,7 +459,7 @@ animation_type_2 d_course_koopa_troopa_beach_unk_data4 = {
 
 
 //! 0x60169b
-u32 d_course_koopa_troopa_beach_unk4[] = {
+uintptr_t d_course_koopa_troopa_beach_unk4[] = {
     0x00000001,
     0x00000002,
 
diff --git a/courses/rainbow_road/course_offsets.c b/courses/rainbow_road/course_offsets.c
index f3bc36e18..5359dab9b 100644
--- a/courses/rainbow_road/course_offsets.c
+++ b/courses/rainbow_road/course_offsets.c
@@ -156,7 +156,7 @@ animation_type_2 *d_rainbow_road_unk3[] = {
 };
 
 // 0x06016110
-u32 d_rainbow_road_unk4[] = {
+uintptr_t d_rainbow_road_unk4[] = {
     0x00000001,
     0x00000002,
 
diff --git a/courses/yoshi_valley/course_offsets.c b/courses/yoshi_valley/course_offsets.c
index c47216781..f5f5cfaf5 100644
--- a/courses/yoshi_valley/course_offsets.c
+++ b/courses/yoshi_valley/course_offsets.c
@@ -230,7 +230,7 @@ animation_type_2 *d_course_yoshi_valley_unk4[] = {
 };
 
 //! 0x06014798
-u32 d_course_yoshi_valley_unk5[] = {
+uintptr_t d_course_yoshi_valley_unk5[] = {
     0x00000001,
     0x00000002,
 
diff --git a/include/course_offsets.h b/include/course_offsets.h
index c1172f290..7f869d922 100644
--- a/include/course_offsets.h
+++ b/include/course_offsets.h
@@ -32,7 +32,7 @@ extern s16 d_rainbow_road_chomp_jaw_animation[];
 extern animation_type_3_triplet d_rainbow_road_unk1[];
 extern animation_type_2 d_rainbow_road_unk2;
 extern animation_type_2 *d_rainbow_road_unk3[];
-extern u32 d_rainbow_road_unk4[];
+extern uintptr_t d_rainbow_road_unk4[];
 extern u32 d_rainbow_road_unk5[];
 
 extern Gfx *koopa_troopa_beach_dls1[];
@@ -41,7 +41,7 @@ extern u32 d_course_koopa_troopa_beach_unk_data1[];
 extern s16 d_course_koopa_troopa_beach_unk_data2[];
 extern animation_type_3_triplet d_course_koopa_troopa_beach_unk_data3[];
 extern animation_type_2 d_course_koopa_troopa_beach_unk_data4;
-extern u32 d_course_koopa_troopa_beach_unk4[];
+extern uintptr_t d_course_koopa_troopa_beach_unk4[];
 extern animation_type_2 *d_course_koopa_troopa_beach_unk_data5[];
 extern u32 d_course_koopa_troopa_beach_unk_data6[];
 
@@ -49,7 +49,7 @@ extern s16 d_course_yoshi_valley_unk1[];
 extern animation_type_3_triplet d_course_yoshi_valley_unk2[];
 extern animation_type_2 d_course_yoshi_valley_unk3;
 extern animation_type_2 *d_course_yoshi_valley_unk4[];
-extern u32 d_course_yoshi_valley_unk5[];
+extern uintptr_t d_course_yoshi_valley_unk5[];
 extern u32 d_course_yoshi_valley_unk6[];
 
 extern u32 d_course_sherbet_land_unk_data1[];
@@ -69,7 +69,6 @@ extern s16 d_rainbow_road_chomp_jaw_animation[];
 extern animation_type_3_triplet d_rainbow_road_unk1[];
 extern animation_type_2 d_rainbow_road_unk2;
 extern animation_type_2 *d_rainbow_road_unk3[];
-extern u32 d_rainbow_road_unk4[];
 extern u32 d_rainbow_road_unk5[];
 
 extern Gfx *koopa_troopa_beach_dls1[];
@@ -78,7 +77,6 @@ extern u32 d_course_koopa_troopa_beach_unk_data1[];
 extern s16 d_course_koopa_troopa_beach_unk_data2[];
 extern animation_type_3_triplet d_course_koopa_troopa_beach_unk_data3[];
 extern animation_type_2 d_course_koopa_troopa_beach_unk_data4;
-extern u32 d_course_koopa_troopa_beach_unk4[];
 extern animation_type_2 *d_course_koopa_troopa_beach_unk_data5[];
 extern u32 d_course_koopa_troopa_beach_unk_data6[];
 
@@ -86,7 +84,6 @@ extern s16 d_course_yoshi_valley_unk1[];
 extern animation_type_3_triplet d_course_yoshi_valley_unk2[];
 extern animation_type_2 d_course_yoshi_valley_unk3;
 extern animation_type_2 *d_course_yoshi_valley_unk4[];
-extern u32 d_course_yoshi_valley_unk5[];
 extern u32 d_course_yoshi_valley_unk6[];
 
 #endif // COURSE_OFFSETS_H
diff --git a/src/code_800029B0.c b/src/code_800029B0.c
index 7cda325f8..dc5db613f 100644
--- a/src/code_800029B0.c
+++ b/src/code_800029B0.c
@@ -309,11 +309,12 @@ void func_80003040(void) {
     set_segment_base_addr(0x3, (void *) (gNextFreeMemoryAddress + 0xFFFF7000));
     destroy_all_actors();
     switch (gCurrentCourseId) {
-        case COURSE_MARIO_RACEWAY:
+        case COURSE_MARIO_RACEWAY: {
             struct ActorSpawnData *a_d_course_mario_raceway_tree_spawns = (struct ActorSpawnData *) LOAD_ASSET(d_course_mario_raceway_tree_spawns);
             dma_textures(gTextureTrees1, 0x35B, 0x800);
             spawn_foliage(a_d_course_mario_raceway_tree_spawns);
             break;
+        }
         case COURSE_BOWSER_CASTLE:
             // d_course_bowsers_castle_packed_dl_1350
             find_vtx_and_set_colours(segmented_gfx_to_virtual(0x07001350), 0x32, 0, 0, 0);
diff --git a/src/code_80091750.c b/src/code_80091750.c
index f9a50daad..843da50f2 100644
--- a/src/code_80091750.c
+++ b/src/code_80091750.c
@@ -3799,12 +3799,13 @@ void func_800996BC(MkTexture *arg0, s32 arg1) {
             }
             switch (arg1) {                /* switch 1; irregular */
             case -1:                            /* switch 1 */
-            case 1:                             /* switch 1 */
+            case 1: {
                 //mio0decode(D_8018D9B4, (u8*)&D_8018D9B0[gD_8018E118TotalSize]);
                 //printf("w: %d, h: %d", texture->width, texture->height);
                 u8 *tex = (u8 *) LOAD_ASSET(texture->textureData);
                 memcpy(&D_8018D9B0[gD_8018E118TotalSize], tex, texture->width * texture->height * 2);
                 break;
+            }
             case 0:                             /* switch 1 */
             case 2:                             /* switch 1 */
                 if (texture->type == 1) {
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index f930d1d64..dfd2276f4 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -30,7 +30,7 @@ float gInterpolationStep = 0.0f;
 #include <MatrixFactory.h>
 #include <BlobFactory.h>
 #include <VertexFactory.h>
-#include <LightsFactory.h>
+// #include <LightsFactory.h>
 }
 
 GameEngine* GameEngine::Instance;
diff --git a/src/racing/render_courses.c b/src/racing/render_courses.c
index 0f1c1d454..989f9048a 100644
--- a/src/racing/render_courses.c
+++ b/src/racing/render_courses.c
@@ -1427,6 +1427,7 @@ void func_80295D88(void) {
     gCollisionMesh = (CollisionTriangle *) gNextFreeMemoryAddress;
     D_800DC5BC = 0;
     D_800DC5C8 = 0;
+    
     switch (gCurrentCourseId) {
         case COURSE_MARIO_RACEWAY:
             // d_course_mario_raceway_packed_dl_1140
@@ -1490,13 +1491,14 @@ void func_80295D88(void) {
             find_vtx_and_set_colours(segmented_gfx_to_virtual(0x07000878), 128, 0, 0, 0);
             D_8015F8E4 = -80.0f;
             break;
-        case COURSE_YOSHI_VALLEY:
+        case COURSE_YOSHI_VALLEY: {
             Lights1 lights4 = gdSPDefLights1(100, 100, 100, 255, 254, 254, 0, 0, 120);
             func_802B5D64(&lights4, -0x38F0, 0x1C70, 1);
             parse_course_displaylists(d_course_yoshi_valley_addr);
             func_80295C6C();
             D_8015F8E4 = gCourseMinY - 10.0f;
             break;
+        }
         case COURSE_FRAPPE_SNOWLAND:
             parse_course_displaylists(d_course_frappe_snowland_addr);
             func_80295C6C();