diff --git a/configure.py b/configure.py
index 7099d2cd..26ffbe76 100644
--- a/configure.py
+++ b/configure.py
@@ -362,7 +362,7 @@ config.libs = [
             Object(NonMatching, "game/board/main.c"),
             Object(NonMatching, "game/board/player.c"),
             Object(NonMatching, "game/board/model.c"),
-            Object(NonMatching, "game/board/window.c"),
+            Object(Matching, "game/board/window.c"),
             Object(NonMatching, "game/board/speaker.c"),
             Object(NonMatching, "game/board/com.c"),
             Object(NonMatching, "game/board/overhead.c"),
diff --git a/include/functions.h b/include/functions.h
index f794de10..7e0f57c1 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -43,9 +43,6 @@ void MGSeqKillAll(void);
 void MGSeqPracticeStart(void);
 void fn_8004D6F4(s16 arg);
 
-void BoardWinKill(void);
-void BoardWinWait(void);
-
 s32 rand8(void);
 
 void BoardCameraTargetSetModel(s16 model); 
diff --git a/include/game/board/window.h b/include/game/board/window.h
index e2d760e6..2d18f4a8 100644
--- a/include/game/board/window.h
+++ b/include/game/board/window.h
@@ -30,6 +30,6 @@ s32 BoardWinPortraitGet(void);
 s32 BoardWinPortraitGetStar(void);
 void BoardWinPlayerSet(s32);
 void BoardWinStartComKeySet(void);
-void BoardWinComKeyFuncSet(void (*)());
+void BoardWinComKeyFuncSet(void (*));
 
 #endif
\ No newline at end of file
diff --git a/src/REL/w10Dll/host.c b/src/REL/w10Dll/host.c
index 799d4e0c..68edcfbb 100644
--- a/src/REL/w10Dll/host.c
+++ b/src/REL/w10Dll/host.c
@@ -22,7 +22,7 @@ void fn_1_AEC(void) {
 }
 
 void fn_1_BA0(s32 arg0) {
-    s32 var_r31;
+    s16 var_r31;
 
     switch (lbl_1_bss_1C) {
     case 0:
diff --git a/src/game/board/window.c b/src/game/board/window.c
index 29057885..90c7479b 100644
--- a/src/game/board/window.c
+++ b/src/game/board/window.c
@@ -390,16 +390,14 @@ void BoardWinStartComKeySet(void) {
 
     if (BoardPlayerIsAllCom() != 0) {
         sp8[0] = sp8[1] = sp8[2] = sp8[3] = 0x100;
-        goto block_20;
-    }
-    if (GWSystem.player_curr == -1) {
-        if ((GWPlayer[0].com == 0) || (GWPlayer[1].com == 0) || (GWPlayer[2].com == 0) || (GWPlayer[3].com == 0)) {
+    } else {
+        if (GWSystem.player_curr == -1) {
+            if ((GWPlayer[0].com == 0) || (GWPlayer[1].com == 0) || (GWPlayer[2].com == 0) || (GWPlayer[3].com == 0)) {
+                return;
+            }
+        } else if (GWPlayer[GWSystem.player_curr].com == 0) {
             return;
         }
-        goto block_9;
-    }
-    if (GWPlayer[GWSystem.player_curr].com != 0) {
-block_9:
         if (GWSystem.player_curr != -1) {
             for (var_r31 = 0; var_r31 < 4; var_r31++) {
                 temp_r29 = GWPlayer[var_r31].port;
@@ -414,18 +412,17 @@ block_9:
                 sp8[var_r31] = 0x100;
             }
         }
-block_20:
-        temp_r28 = GWMessSpeedGet();
-        temp_r30 = HuWinKeyWaitNumGet(winMess);
-        if (temp_r30 != 0) {
-            HuWinComKeyReset();
-            for (var_r31 = 0; var_r31 < temp_r30; var_r31++) {
-                HuWinComKeyWait(sp8[0], sp8[1], sp8[2], sp8[3], (s32)temp_r28);
-            }
+    }
+    temp_r28 = GWMessSpeedGet();
+    temp_r30 = HuWinKeyWaitNumGet(winMess);
+    if (temp_r30 != 0) {
+        HuWinComKeyReset();
+        for (var_r31 = 0; var_r31 < temp_r30; var_r31++) {
+            HuWinComKeyWait(sp8[0], sp8[1], sp8[2], sp8[3], (s32)temp_r28);
         }
     }
 }
 
-void BoardWinComKeyFuncSet(void (*func)()) {
+void BoardWinComKeyFuncSet(void (*func)) {
     comKeyFunc = func;
 }
\ No newline at end of file