diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm
index 164ff065758..5f4d14740a2 100644
--- a/code/game/gamemodes/heist/heist.dm
+++ b/code/game/gamemodes/heist/heist.dm
@@ -261,7 +261,7 @@ datum/game_mode/proc/auto_declare_completion_heist()
 			text += "<br>[vox.key] was [vox.name] ("
 			if(check_return)
 				var/obj/stack = raiders[vox]
-				if(get_area(stack) != locate(/area/shuttle/vox/station))
+				if(get_area(stack.loc) != locate(/area/shuttle/vox/station))
 					text += "left behind)"
 					continue
 			if(vox.current)
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 17a2f1ebc12..5bf735e72ad 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -837,7 +837,7 @@
 		return 0
 	else if(is_auth_rcon(href_list))
 		return 0
-	else if(isAI(user))
+	else if(isAI(user) || isrobot(user))
 		return 0
 	else
 		return locked
@@ -852,7 +852,7 @@
 	if(buildstage != 2)
 		return STATUS_CLOSE
 
-	if(aidisabled && isAI(user))
+	if(aidisabled && (isAI(user) || isrobot(user)))
 		user << "<span class='warning'>AI control for \the [src] interface has been disabled.</span>"
 		return STATUS_CLOSE
 
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 2fcd6c36d45..7c235022c92 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -872,7 +872,7 @@
 /obj/machinery/power/apc/proc/is_authenticated(mob/user as mob)
 	if(isobserver(user) && check_rights(R_ADMIN, 0, user))
 		return 1
-	if(isAI(user))
+	if(isAI(user) || isrobot(user))
 		return 1
 	else
 		return !locked
@@ -880,7 +880,7 @@
 /obj/machinery/power/apc/proc/is_locked(mob/user as mob)
 	if(isobserver(user) && check_rights(R_ADMIN, 0, user))
 		return 0
-	if(isAI(user))
+	if(isAI(user) || isrobot(user))
 		return 0
 	else
 		return locked