diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index cae1788af1e..9b230cc3d2e 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -16,9 +16,6 @@
 
 	clicksound = "keyboard"
 
-/obj/machinery/computer/New()
-	..()
-
 /obj/machinery/computer/Initialize()
 	. = ..()
 	power_change()
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 97a2b9ae761..c576b96635f 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -189,9 +189,7 @@ GLOBAL_LIST_EMPTY(apcs)
 
 	pixel_x = (dir & 3)? 0 : (dir == 4 ? 26 : -26) //VOREStation Edit -> 24 to 26
 	pixel_y = (dir & 3)? (dir ==1 ? 26 : -26) : 0 //VOREStation Edit -> 24 to 26
-	if(building==0)
-		init()
-	else
+	if(building)
 		area = get_area(src)
 		area.apc = src
 		opened = 1
@@ -200,6 +198,16 @@ GLOBAL_LIST_EMPTY(apcs)
 		stat |= MAINT
 		update_icon()
 
+/obj/machinery/power/apc/Initialize(mapload, ndir, building)
+	. = ..()
+	if(!building)
+		init()
+		return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/power/apc/LateInitialize()
+	. = ..()
+	update()
+
 /obj/machinery/power/apc/Destroy()
 	GLOB.apcs -= src
 	update()
@@ -268,9 +276,6 @@ GLOBAL_LIST_EMPTY(apcs)
 
 	make_terminal()
 
-	spawn(5)
-		update()
-
 /obj/machinery/power/apc/examine(mob/user)
 	. = ..()
 	if(Adjacent(user))