diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index d67bef50c6..6f4ac6543c 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -617,7 +617,7 @@ var/list/slot_equipment_priority = list( \
 		pulling.pulledby = null
 		pulling = null
 		if(pullin)
-			pullin.icon_state = "pull1"
+			pullin.icon_state = "pull0"
 
 /mob/proc/start_pulling(var/atom/movable/AM)
 	if ( !AM || !usr || src==AM || !isturf(src.loc) )	//if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
@@ -645,7 +645,7 @@ var/list/slot_equipment_priority = list( \
 	AM.pulledby = src
 
 	if(pullin)
-		pullin.icon_state = "pull0"
+		pullin.icon_state = "pull1"
 
 	if(ishuman(AM))
 		var/mob/living/carbon/human/H = AM
diff --git a/code/modules/overmap/_defines.dm b/code/modules/overmap/_defines.dm
index 23b6e58845..6d17d8e398 100644
--- a/code/modules/overmap/_defines.dm
+++ b/code/modules/overmap/_defines.dm
@@ -24,16 +24,15 @@ proc/toggle_move_stars(zlevel, direction)
 		moving_levels["zlevel"] = gen_dir
 		for(var/x = 1 to world.maxx)
 			for(var/y = 1 to world.maxy)
-				spawn(0)
-					var/turf/space/T = locate(x,y,zlevel)
-					if (T)
-						if(!gen_dir)
-							T.icon_state = "[((T.x + T.y) ^ ~(T.x * T.y) + T.z) % 25]"
-						else
-							T.icon_state = "speedspace_[gen_dir]_[rand(1,15)]"
-							for(var/atom/movable/AM in T)
-								if (!AM.anchored)
-									AM.throw_at(get_step(T,reverse_direction(direction)), 5, 1)
+				var/turf/space/T = locate(x,y,zlevel)
+				if (istype(T))
+					if(!gen_dir)
+						T.icon_state = "[((T.x + T.y) ^ ~(T.x * T.y) + T.z) % 25]"
+					else
+						T.icon_state = "speedspace_[gen_dir]_[rand(1,15)]"
+						for(var/atom/movable/AM in T)
+							if (!AM.anchored)
+								AM.throw_at(get_step(T,reverse_direction(direction)), 5, 1)
 
 
 //list used to cache empty zlevels to avoid nedless map bloat
@@ -99,4 +98,4 @@ proc/overmap_spacetravel(var/turf/space/T, var/atom/movable/A)
 		if (source.can_die())
 			testing("Catching [M] for future use")
 			source.loc = null
-			cached_space += source
\ No newline at end of file
+			cached_space += source