diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 2a138be4e2cc..1ef9f65d6dfa 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -484,7 +484,7 @@ Used by the AI doomsday and the self-destruct nuke.
 
 /datum/controller/subsystem/mapping/proc/load_random_arena()
 	var/start_time = REALTIMEOFDAY
-	for(var/obj/effect/spawner/random_arena/arena_spawner as() in random_bar_spawners)
+	for(var/obj/effect/spawner/random_arena_spawner/arena_spawner as() in random_arena_spawners)
 		var/list/possible_arena_templates = list()
 		var/datum/map_template/random_room/random_arena/arena_candidate
 		shuffle_inplace(random_arena_templates)
diff --git a/monkestation/code/modules/ghost_players/ghost_player.dm b/monkestation/code/modules/ghost_players/ghost_player.dm
index b4723f87653e..abb3458b6f76 100644
--- a/monkestation/code/modules/ghost_players/ghost_player.dm
+++ b/monkestation/code/modules/ghost_players/ghost_player.dm
@@ -23,8 +23,9 @@
 
 /mob/living/carbon/human/ghost/Destroy()
 	. = ..()
-	if(dueling)
-		linked_button?.end_duel(src)
+	if(dueling && linked_button)
+		addtimer(CALLBACK(linked_button, PROC_REF(end_duel), src), 3 SECONDS)
+
 	if(linked_button)
 		linked_button.remove_user(src)
 		linked_button = null