diff --git a/spec b/spec
index c8e02a251f..705786d9b3 100644
--- a/spec
+++ b/spec
@@ -2328,11 +2328,7 @@ beginseg
     name "ovl_Boss_06"
     compress
     include "build/src/overlays/actors/ovl_Boss_06/z_boss_06.o"
-#ifdef NON_MATCHING
     include "build/src/overlays/actors/ovl_Boss_06/ovl_Boss_06_reloc.o"
-#else
-    include "build/data/ovl_Boss_06/ovl_Boss_06.reloc.o"
-#endif
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c
index 92db6dc894..a06fe25d10 100644
--- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c
+++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c
@@ -182,8 +182,6 @@ void func_809F24A8(Boss06* this) {
     this->unk_1AC = 0.0f;
 }
 
-#ifdef NON_MATCHING
-// The 1 constant from the switch branch is reused in case 2 for some reason.
 void func_809F24C8(Boss06* this, PlayState* play) {
     s16 sp4E = 0;
     Player* player = GET_PLAYER(play);
@@ -344,9 +342,6 @@ void func_809F24C8(Boss06* this, PlayState* play) {
         Play_SetCameraAtEye(play, this->subCamId, &this->subCamAt, &this->subCamEye);
     }
 }
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_06/func_809F24C8.s")
-#endif
 
 void func_809F2B64(Boss06* this, PlayState* play) {
     this->actionFunc = func_809F2C44;
diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.h b/src/overlays/actors/ovl_En_Knight/z_en_knight.h
index 2d413fea37..dc8fb1bcaf 100644
--- a/src/overlays/actors/ovl_En_Knight/z_en_knight.h
+++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.h
@@ -11,9 +11,9 @@ typedef struct EnKnight {
     /* 0x000 */ Actor actor;
     /* 0x144 */ s16 unk_144;
     /* 0x146 */ char unk_146[0x2];
-    /* 0x148 */ s8 unk_148;
+    /* 0x148 */ u8 unk_148;
     /* 0x149 */ char unk_149[0x8];
-    /* 0x151 */ s8 unk_151;
+    /* 0x151 */ u8 unk_151;
     /* 0x152 */ char unk_152[0x1];
     /* 0x153 */ u8 unk_153;
     /* 0x154 */ u8 unk_154;