diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index d6e0e25369b..f3168829afd 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -969,11 +969,11 @@ var/global/datum/controller/occupations/job_master
 				return
 			to_chat(C, span_filter_warning("Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead."))
 			var/spawning = pick(latejoin)
-			.["turf"] = get_turf(spawning)
+			.["turf"] = spawning
 			.["msg"] = "will arrive at the station shortly"
 	else if(!fail_deadly)
 		var/spawning = pick(latejoin)
-		.["turf"] = get_turf(spawning)
+		.["turf"] = spawning
 		.["msg"] = "has arrived on the station"
 
 /datum/controller/occupations/proc/m_backup_client(var/client/C)	//Same as m_backup, but takes a client entry. Used for vore late joining.
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 6e736f34973..c9a134b5985 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -21,13 +21,12 @@
 			newplayer_start += loc
 			delete_me = TRUE
 		if("JoinLate") // Bit difference, since we need the spawn point to move.
-			latejoin += src
-			simulated = TRUE
-		//	delete_me = TRUE
+			latejoin += loc
+			delete_me = TRUE
 		if("JoinLateGateway")
 			latejoin_gateway += loc
-			latejoin += src				//VOREStation Addition
-			// delete_me = TRUE
+			latejoin += loc				//VOREStation Addition
+			delete_me = TRUE
 		if("JoinLateElevator")
 			latejoin_elevator += loc
 			delete_me = TRUE
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 3abacd1897a..c5cdfb638bc 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -485,7 +485,13 @@ Traitors and the like can also be revived with the previous role mostly intact.
 					return
 
 		if("Arrivals") //Spawn them at a latejoin spawnpoint
-			spawnloc = pick(latejoin)
+			if(LAZYLEN(latejoin))
+				spawnloc = pick(latejoin)
+			else if(LAZYLEN(latejoin_tram))
+				spawnloc = pick(latejoin_tram)
+			else
+				to_chat(src, "This map has no latejoin spawnpoint.")
+				return
 
 		else //I have no idea how you're here
 			to_chat(src, "Invalid spawn location choice.")
diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 67d8ed751a2..4fba837f5bb 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -1213,7 +1213,7 @@
 	else
 		log_debug("[src] (\ref[src]) doesn't have an owner, and dropped someone at a latespawn point!")
 		var/fallback = pick(latejoin)
-		return get_turf(fallback)
+		return fallback
 
 //Yes, it's ""safe"" to drop items here
 /obj/belly/AllowDrop()