diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index cb182a6a3e4..f4039ada182 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -140,8 +140,10 @@
 	if(src.eyeobj && src.loc)
 		src.eyeobj.loc = src.loc
 	else
-		src << "ERROR: Eyeobj not found. Please report this to Giacom. Creating new eye..."
+		src << "ERROR: Eyeobj not found. Creating new eye..."
 		src.eyeobj = new(src.loc)
+		src.eyeobj.ai = src
+		src.eyeobj.name = "[src.name] (AI Eye)" // Give it a name
 
 	if(client && client.eye)
 		client.eye = src
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 60687c247bc..93c8a7d224e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -174,6 +174,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
 		maxHealth = health
 		if(staff)
 			src.staff = staff
+			faction = "\ref[staff]" // very unique
 		return 1
 	return