diff --git a/src/pc/djui/djui_panel_player.c b/src/pc/djui/djui_panel_player.c
index f75ceab25..5e5f0897e 100644
--- a/src/pc/djui/djui_panel_player.c
+++ b/src/pc/djui/djui_panel_player.c
@@ -166,6 +166,7 @@ static void djui_panel_player_edit_palette_create(struct DjuiBase* caller) {
     }
 
     djui_panel_add(caller, panel, NULL);
+    gDjuiPanelPlayerCreated = true;
 }
 
 static bool djui_panel_player_name_valid(char* buffer) {
diff --git a/src/pc/lua/utils/smlua_deprecated.c b/src/pc/lua/utils/smlua_deprecated.c
index 601260662..b9d728b4c 100644
--- a/src/pc/lua/utils/smlua_deprecated.c
+++ b/src/pc/lua/utils/smlua_deprecated.c
@@ -5,7 +5,7 @@
 #endif
 #include "pc/lua/smlua.h"
 
-char* network_discord_id_from_local_index(u8 localIndex) {
+char* network_discord_id_from_local_index(UNUSED u8 localIndex) {
 #ifdef DISCORD_SDK
     static char sDiscordId[64] = "";
     if (localIndex == 0) {
diff --git a/src/pc/network/network.c b/src/pc/network/network.c
index f4722b12a..7b3366eea 100644
--- a/src/pc/network/network.c
+++ b/src/pc/network/network.c
@@ -701,7 +701,7 @@ void network_shutdown(bool sendLeaving, bool exiting, bool popup, bool reconnect
     gOverrideAllowToxicGasCamera = FALSE;
     gNoteFreqScale = 1.0f;
 
-    struct Controller* cnt = gMarioStates[0].controller;
+    struct Controller* cnt = gPlayer1Controller;
     cnt->rawStickX = 0;
     cnt->rawStickY = 0;
     cnt->stickX = 0;