diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index 336ac002671..7db62612994 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -27,7 +27,7 @@
 /obj/item/device/powersink/Destroy()
 	processing_objects.Remove(src)
 	processing_power_items.Remove(src)
-	..()
+	return ..()
 
 /obj/item/device/powersink/attackby(var/obj/item/I, var/mob/user)
 	if(istype(I, /obj/item/weapon/screwdriver))
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 03dc1c4eac9..c5b84b358a7 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -140,7 +140,7 @@
 /obj/machinery/power/apc/Destroy()
 	if(malfai && operating)
 		if (ticker.mode.config_tag == "malfunction")
-			if (src.z == 1) //if (is_type_in_list(get_area(src), the_station_areas))
+			if (src.z == ZLEVEL_STATION)
 				ticker.mode:apcs--
 	area.power_light = 0
 	area.power_equip = 0
@@ -153,7 +153,7 @@
 		qdel(cell) // qdel
 	if(terminal)
 		disconnect_terminal()
-	..()
+	return ..()
 
 /obj/machinery/power/apc/proc/make_terminal()
 	// create a terminal object at the same position as original turf loc
diff --git a/nano/templates/apc.tmpl b/nano/templates/apc.tmpl
index 0e5ee45d4ce..3824d8f5e81 100644
--- a/nano/templates/apc.tmpl
+++ b/nano/templates/apc.tmpl
@@ -167,11 +167,11 @@
 			{{:helper.link('Overload Lighting Circuit', 'lightbulb', {'overload' : 1})}}
 			{{if data.malfStatus == 1}}
 				{{:helper.link('Override Programming', 'script', {'malfhack' : 1})}}
-			{{else malfStatus == 2}}
+			{{else data.malfStatus == 2}}
 				{{:helper.link('Shunt Core Processes', 'arrowreturn-1-s', {'occupyapc' : 1})}}
-			{{else malfStatus == 3}}
+			{{else data.malfStatus == 3}}
 				{{:helper.link('Return to Main Core', 'arrowreturn-1-w', {'deoccupyapc' : 1})}}
-			{{else malfStatus == 4}}
+			{{else data.malfStatus == 4}}
 				{{:helper.link('Shunt Core Processes', 'arrowreturn-1-s', {'occupyapc' : 1}, 'linkOff')}}
 			{{/if}}
 		</div>