diff --git a/code/game/objects/items/weapons/cameras.dm b/code/game/objects/items/weapons/cameras.dm
index 93ec9fa418c..504bde28c77 100644
--- a/code/game/objects/items/weapons/cameras.dm
+++ b/code/game/objects/items/weapons/cameras.dm
@@ -82,6 +82,7 @@
 
 	var/itemnumber = 0
 	for(var/atom/A in the_turf)
+		if(istype(A, /obj/item/weapon/photo))	continue
 		if(A.invisibility) continue
 		if(ismob(A))
 			var/icon/X = build_composite_icon(A)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 8ae74bf4377..4c186fa7b0b 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -904,21 +904,17 @@
 		return
 	if(src.z != 1)
 		return
-
 	src.occupant = new /mob/living/silicon/ai(src,malf.laws,null,1)
 	src.occupant.adjustOxyLoss(malf.getOxyLoss())
-	src.occupant.name = "[malf.name] APC Copy"
-
+	if(!findtext(src.occupant.name,"APC Copy"))
+		src.occupant.name = "[malf.name] APC Copy"
 	if(malf.parent)
 		src.occupant.parent = malf.parent
 	else
 		src.occupant.parent = malf
-
 	malf.mind.transfer_to(src.occupant)
-
 	if(malf.parent)
 		del(malf)
-
 	src.occupant.verbs += /mob/living/silicon/ai/proc/corereturn
 	src.occupant.cancel_camera()