diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index e0798e63348..f780cfe50ce 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -96,13 +96,13 @@
 	for(var/obj/effect/landmark/start/sloc in world)
 		if (sloc.name != "AI")
 			continue
-		if (locate(/mob) in sloc.loc)
+		if (locate(/mob/living) in sloc.loc)
 			continue
 		loc_landmark = sloc
 	if (!loc_landmark)
 		for(var/obj/effect/landmark/tripai in world)
 			if (tripai.name == "tripai")
-				if(locate(/mob) in tripai.loc)
+				if(locate(/mob/living) in tripai.loc)
 					continue
 				loc_landmark = tripai
 	if (!loc_landmark)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 22d810a801d..c78517f3870 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -437,6 +437,8 @@
 //source is an object caused electrocuting (airlock, grille, etc)
 //No animations will be performed by this proc.
 /proc/electrocute_mob(mob/living/carbon/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0)
+	if(istype(M.loc,/obj/mecha))
+		return 0
 	if(istype(M,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		if(H.gloves)