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/modules/vore/eating/leave_remains_vr.dm b/code/modules/vore/eating/leave_remains_vr.dm
index a95adb094b..f7e9f6d952 100644
--- a/code/modules/vore/eating/leave_remains_vr.dm
+++ b/code/modules/vore/eating/leave_remains_vr.dm
@@ -70,12 +70,13 @@
 	var/pred_ckey
 	var/pred_name
 
-/obj/item/weapon/digestion_remains/New(newloc, mob/living/pred)
-	..(newloc)
-	pred_ckey = pred.ckey
-	pred_name = pred.name
+/obj/item/weapon/digestion_remains/Initialize(var/mapload, var/mob/living/pred)
+	. = ..()
+	if(!mapload)
+		pred_ckey = pred?.ckey
+		pred_name = pred?.name
 
-/obj/item/weapon/digestion_remains/attack_self(mob/user)
+/obj/item/weapon/digestion_remains/attack_self(var/mob/user)
 	if(user.a_intent == I_HURT)
 		to_chat(user,"<span class='warning'>As you squeeze the [name], it crumbles into dust and falls apart into nothing!</span>")
 		qdel(src)