diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index cf582cfb99..cda133a1c0 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -312,6 +312,7 @@ Class Procs:
 		qdel(C)
 		C = new /obj/item/weapon/cell/high(src)
 		component_parts += C
+		return C
 
 /obj/machinery/proc/default_part_replacement(var/mob/user, var/obj/item/weapon/storage/part_replacer/R)
 	if(!istype(R))
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 0f1a96c8c7..825c12db42 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -25,7 +25,7 @@
 /obj/machinery/recharge_station/Initialize()
 	. = ..()
 	default_apply_parts()
-	default_use_hicell()
+	cell = default_use_hicell()
 	update_icon()
 
 /obj/machinery/recharge_station/proc/has_cell_power()
diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index 94ef0425b6..27c8287f31 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -55,7 +55,7 @@
 /obj/machinery/mining/drill/Initialize()
 	. = ..()
 	default_apply_parts()
-	default_use_hicell()
+	cell = default_use_hicell()
 
 /obj/machinery/mining/drill/process()