diff --git a/code/game/objects/devices/aicard.dm b/code/game/objects/devices/aicard.dm
index 3d3b8a547c4..2f33d2918e9 100644
--- a/code/game/objects/devices/aicard.dm
+++ b/code/game/objects/devices/aicard.dm
@@ -35,6 +35,8 @@
 					M.fireloss = A.fireloss
 					M.bruteloss = A.bruteloss
 					M.toxloss = A.toxloss
+					if (!A.stat)
+						M.stat = A.stat
 					M.updatehealth()
 					M << "You have been uploaded to a stationary terminal. Remote device connection restored."
 					user << "<b>Transfer succesful</b>: [M.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 42962ab9b92..188bc20c8f4 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -56,7 +56,7 @@
 					loc = T.loc
 					if (istype(loc, /area))
 						//stage = 4
-						if (!loc.master.power_equip)
+						if (!loc.master.power_equip && isturf(src.loc))
 							//stage = 5
 							blind = 1
 
@@ -100,7 +100,7 @@
 					src.see_in_dark = 0
 					src.see_invisible = 0
 
-					if ((!loc.master.power_equip) || istype(T, /turf/space))
+					if (((!loc.master.power_equip) || istype(T, /turf/space)) && isturf(src.loc))
 						if (src:aiRestorePowerRoutine==0)
 							src:aiRestorePowerRoutine = 1