diff --git a/src/pc/controller/controller_keyboard_debug.c b/src/pc/controller/controller_keyboard_debug.c
index 3467533b..ce0bf5dd 100644
--- a/src/pc/controller/controller_keyboard_debug.c
+++ b/src/pc/controller/controller_keyboard_debug.c
@@ -7,7 +7,7 @@
 
 #ifdef DEBUG
 
-static u8 warpToLevel = LEVEL_CCM;
+static u8 warpToLevel = LEVEL_SSL;
 
 #define SCANCODE_0 0x0B
 #define SCANCODE_1 0x02
diff --git a/src/pc/network/packets/packet_player.c b/src/pc/network/packets/packet_player.c
index 59ce6885..3bc92b74 100644
--- a/src/pc/network/packets/packet_player.c
+++ b/src/pc/network/packets/packet_player.c
@@ -201,7 +201,7 @@ void network_receive_player(struct Packet* p) {
     if (heldSyncID != 0 && gSyncObjects[heldSyncID].o != NULL) {
         // TODO: do we have to move graphics nodes around to make this visible?
         struct Object* heldObj = gSyncObjects[heldSyncID].o;
-        if (m->heldObj == heldObj && gNetworkType == NT_CLIENT) { // two-player hack: needs priority
+        if (gMarioStates[0].heldObj == heldObj && gNetworkType == NT_CLIENT) { // two-player hack: needs priority
             mario_drop_held_object(&gMarioStates[0]);
             force_idle_state(&gMarioStates[0]);
         }