diff --git a/code/controllers/subsystems/xenoarch.dm b/code/controllers/subsystems/xenoarch.dm
index c8184d783e..2e22213ee6 100644
--- a/code/controllers/subsystems/xenoarch.dm
+++ b/code/controllers/subsystems/xenoarch.dm
@@ -99,6 +99,9 @@ SUBSYSTEM_DEF(xenoarch)
 			if(isnull(M.artifact_find) && digsite != DIGSITE_GARDEN && digsite != DIGSITE_ANIMAL)
 				artifact_spawning_turfs.Add(archeo_turf)
 
+		//Larger maps will convince byond this is an infinite loop, so let go for a second
+		CHECK_TICK
+
 	//create artifact machinery
 	var/num_artifacts_spawn = rand(ARTIFACTSPAWNNUM_LOWER, ARTIFACTSPAWNNUM_UPPER)
 	while(artifact_spawning_turfs.len > num_artifacts_spawn)
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index e2ca7f36f6..29bad72682 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -45,7 +45,7 @@
 
 		if(!AM.anchored)
 			AM.throw_at(get_step(src,reverse_direction(direction)), 5, 1)
-		else if (istype(AM, /obj/effect))
+		else if (istype(AM, /obj/effect/decal))
 			qdel(AM) //No more space blood coming with the shuttle
 
 /turf/space/proc/build_overedge(var/forced_dirs)
diff --git a/code/modules/maps/tg/reader.dm b/code/modules/maps/tg/reader.dm
index a95f16a287..6efb035a3f 100644
--- a/code/modules/maps/tg/reader.dm
+++ b/code/modules/maps/tg/reader.dm
@@ -292,6 +292,7 @@ var/global/use_preloader = FALSE
 			old_position = dpos + 1
 
 			if(!atom_def) // Skip the item if the path does not exist.  Fix your crap, mappers!
+				error("Maploader skipping undefined type: '[trim_text(copytext(full_def, 1, variables_start))]' (key=[model_key])")
 				continue
 			members.Add(atom_def)