diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index 9b292a219d..28505c70f8 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -93,6 +93,7 @@ SUBSYSTEM_DEF(input)
 		user.full_macro_assert()
 
 /datum/controller/subsystem/input/fire()
+	set waitfor = FALSE
 	var/list/clients = GLOB.clients // Let's sing the list cache song
 	for(var/i in 1 to clients.len)
 		var/client/C = clients[i]
diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm
index 648ba27897..d0fd4dc3f6 100644
--- a/code/game/objects/items/puzzle_pieces.dm
+++ b/code/game/objects/items/puzzle_pieces.dm
@@ -137,8 +137,7 @@
 		AM.anchored = TRUE
 		flick("laserbox_burn", AM)
 		trigger()
-		sleep(15)
-		qdel(AM)
+		QDEL_IN(src, 15)
 
 // snowflake code until undertile elements
 /obj/item/pressure_plate/hologrid/hide()
diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm
index 81c59d481e..b5f09c65ca 100644
--- a/code/modules/keybindings/setup.dm
+++ b/code/modules/keybindings/setup.dm
@@ -5,7 +5,7 @@
 	SHOULD_NOT_SLEEP(TRUE)
 
 /datum/proc/keyLoop(client/user) // Called once every frame
-	//SHOULD_NOT_SLEEP(TRUE)
+	SHOULD_NOT_SLEEP(TRUE)
 
 /client/verb/fix_macros()
 	set name = "Fix Keybindings"