diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 01e846632c..38247ea887 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -410,7 +410,7 @@
 /turf/proc/empty(turf_type=/turf/open/space, baseturf_type)
 	// Remove all atoms except observers, landmarks, docking ports
 	var/turf/T0 = src
-	var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object))
+	var/static/list/ignored_atoms = typecacheof(list(/turf, /mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object))
 	var/list/allowed_contents = typecache_filter_list(T0.GetAllContents(),ignored_atoms,reversed=TRUE)
 	for(var/i in 1 to allowed_contents.len)
 		var/thing = allowed_contents[i]
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 696372decf..237b42bd0f 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -13,8 +13,8 @@ All ShuttleMove procs go here
 // Called from the new turf before anything has been moved
 // Only gets called if fromShuttleMove returns true first
 /turf/proc/toShuttleMove(turf/oldT, shuttle_dir)
-	for(var/i in 1 to contents.len)
-		var/atom/movable/thing = contents[i]
+	for(var/i in contents)
+		var/atom/movable/thing = i
 		if(ismob(thing))
 			if(isliving(thing))
 				var/mob/living/M = thing