diff --git a/code/datums/helper_datums/hotkey_modes.dm b/code/datums/helper_datums/hotkey_modes.dm
index 39254b23485..b2dd1537308 100644
--- a/code/datums/helper_datums/hotkey_modes.dm
+++ b/code/datums/helper_datums/hotkey_modes.dm
@@ -8,8 +8,8 @@
 	my_mob = mob
 
 /datum/hotkey_mode/proc/set_winset_values()
-	winset(my_mob, null, "mainwindow.macro=[macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5")
-	winset(my_mob, null, "hotkey_toggle.command=\".winset \\\"mainwindow.macro != [macro_hotkeys_inactive] ? mainwindow.macro=[macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5 : mainwindow.macro=[macro_hotkeys_active] hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#f0f0f0\\\"\"")
+	//winset(my_mob, null, "mainwindow.macro=[macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5")
+	//winset(my_mob, null, "hotkey_toggle.command=\".winset \\\"mainwindow.macro != [macro_hotkeys_inactive] ? mainwindow.macro=[macro_hotkeys_inactive] hotkey_toggle.is-checked=false input.focus=true input.background-color=#d3b5b5 : mainwindow.macro=[macro_hotkeys_active] hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#f0f0f0\\\"\"")
 
 /datum/hotkey_mode/qwerty
 	name = "QWERTY"
diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm
index 548a734f74c..cbf3e1bf9f6 100644
--- a/code/modules/keybindings/bindings_client.dm
+++ b/code/modules/keybindings/bindings_client.dm
@@ -46,7 +46,7 @@
 		mob.focus.key_up(_key, src)
 
 // Called every game tick
-/client/keyLoop()
+/client/proc/keyLoop()
 	if(holder)
 		holder.keyLoop(src)
 	if(mob.focus)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index b47c8c26365..3b1bddb0246 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -519,7 +519,7 @@
 		return
 
 	var/next_in_line
-	if (mob.zone_selected == BODY_ZONE_R_ARM)
+	if(mob.zone_selected == BODY_ZONE_R_ARM)
 		next_in_line = BODY_ZONE_R_HAND
 	else
 		next_in_line = BODY_ZONE_R_ARM
@@ -545,7 +545,7 @@
 		return
 		
 	var/next_in_line
-	if (mob.zone_selected == BODY_ZONE_L_ARM)
+	if(mob.zone_selected == BODY_ZONE_L_ARM)
 		next_in_line = BODY_ZONE_L_HAND
 	else
 		next_in_line = BODY_ZONE_L_ARM
@@ -561,7 +561,7 @@
 		return
 		
 	var/next_in_line
-	if (mob.zone_selected == BODY_ZONE_R_LEG)
+	if(mob.zone_selected == BODY_ZONE_R_LEG)
 		next_in_line = BODY_ZONE_R_FOOT
 	else
 		next_in_line = BODY_ZONE_R_LEG
@@ -587,7 +587,7 @@
 		return
 		
 	var/next_in_line
-	if (mob.zone_selected == BODY_ZONE_L_LEG)
+	if(mob.zone_selected == BODY_ZONE_L_LEG)
 		next_in_line = BODY_ZONE_L_FOOT
 	else
 		next_in_line = BODY_ZONE_L_LEG