diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 5b96efc83d..10ab6923eb 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -148,11 +148,11 @@ Class Procs:
 		START_PROCESSING(SSmachines, src)
 	else
 		START_PROCESSING(SSfastprocess, src)
-	power_change()
 	RegisterSignal(src, COMSIG_ENTER_AREA, .proc/power_change)
 
 	if (occupant_typecache)
 		occupant_typecache = typecacheof(occupant_typecache)
+	return INITIALIZE_HINT_LATELOAD
 
 /obj/machinery/Destroy()
 	GLOB.machines.Remove(src)
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index 6d7e0fda3f..03d9dcee4b 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -25,6 +25,7 @@
 	pixel_x = -26
 
 /obj/machinery/light_switch/Initialize()
+	. = ..()
 	if(istext(area))
 		area = text2path(area)
 	if(ispath(area))
@@ -36,7 +37,6 @@
 
 	if(!name)
 		name = "light switch ([area.name])"
-	. = ..()
 
 /obj/machinery/light_switch/update_appearance(updates=ALL)
 	. = ..()
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 2cfabb1b59..907c4e7d65 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -25,6 +25,7 @@
 	var/efficiency = 1
 
 /obj/machinery/power/solar/Initialize(mapload, obj/item/solar_assembly/S)
+	. = ..()
 	panel = new()
 	panel.vis_flags = VIS_INHERIT_ID|VIS_INHERIT_ICON|VIS_INHERIT_PLANE
 	vis_contents += panel
@@ -34,7 +35,6 @@
 	Make(S)
 	connect_to_network()
 	RegisterSignal(SSsun, COMSIG_SUN_MOVED, .proc/queue_update_solar_exposure)
-	. = ..()
 
 /obj/machinery/power/solar/Destroy()
 	unset_control() //remove from control computer