diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 9ae657d65b0..d2b654d76f9 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -262,7 +262,7 @@ effective or pretty fucking useless.
 	//SKYRAT EDIT ADDITION BEGIN
 /obj/item/jammer/ComponentInitialize()
 	. = ..()
-	AddComponent(/datum/component/cell, power_use_amount, CALLBACK(src, .proc/turn_off))
+	AddComponent(/datum/component/cell, null, CALLBACK(src, .proc/turn_off))
 
 /obj/item/jammer/proc/turn_on()
 	active = TRUE
diff --git a/modular_skyrat/modules/central_command_module/code/computers/import_console.dm b/modular_skyrat/modules/central_command_module/code/computers/import_console.dm
index b6ceb27df7e..3857df59ba5 100644
--- a/modular_skyrat/modules/central_command_module/code/computers/import_console.dm
+++ b/modular_skyrat/modules/central_command_module/code/computers/import_console.dm
@@ -25,6 +25,8 @@ GLOBAL_LIST_EMPTY(cargo_control_consoles)
 /obj/machinery/computer/cargo_control_console/Destroy()
 	if(radio)
 		QDEL_NULL(radio)
+	GLOB.cargo_control_consoles -= src
+	possible_floors = null
 	. = ..()
 
 
diff --git a/modular_skyrat/modules/demon_floor/code/floor_demon.dm b/modular_skyrat/modules/demon_floor/code/floor_demon.dm
index c266df31b66..151c1bb01d7 100644
--- a/modular_skyrat/modules/demon_floor/code/floor_demon.dm
+++ b/modular_skyrat/modules/demon_floor/code/floor_demon.dm
@@ -63,8 +63,9 @@ GLOBAL_LIST_EMPTY(cluwne_maze)
 		QDEL_NULL(poi)
 	if(cluwnehole)
 		QDEL_NULL(cluwnehole)
-	if(current_victim)
-		current_victim = null
+	current_victim = null
+	target_area = null
+	invalid_area_typecache = null
 	return ..()
 
 
diff --git a/modular_skyrat/modules/hyposprays/code/game/hypospray_kits.dm b/modular_skyrat/modules/hyposprays/code/game/hypospray_kits.dm
index c6e8d12fa1f..de477029cfb 100644
--- a/modular_skyrat/modules/hyposprays/code/game/hypospray_kits.dm
+++ b/modular_skyrat/modules/hyposprays/code/game/hypospray_kits.dm
@@ -16,9 +16,15 @@
 //Code to give hypospray kits selectable paterns.
 
 /obj/item/storage/hypospraykit/Initialize()
-	..()
+	. = ..()
 	if(!length(case_designs))
 		populate_case_designs()
+	var/datum/component/storage/stored = GetComponent(/datum/component/storage)
+	stored.max_items = 12
+	stored.can_hold = typecacheof(list(
+		/obj/item/hypospray/mkii,
+		/obj/item/reagent_containers/glass/bottle/vial
+	))
 	update_icon_state()
 	update_icon()
 
@@ -64,15 +70,6 @@
 
 //END OF HYPOSPRAY CASE MENU CODE
 
-/obj/item/storage/hypospraykit/ComponentInitialize()
-	. = ..()
-	var/datum/component/storage/stored = GetComponent(/datum/component/storage)
-	stored.max_items = 12
-	stored.can_hold = typecacheof(list(
-	/obj/item/hypospray/mkii,
-	/obj/item/reagent_containers/glass/bottle/vial))
-
-
 /obj/item/storage/hypospraykit/empty
 	desc = "A hypospray kit with general use vials."
 
diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm
index 72f0b814c56..c1ee3f8de54 100644
--- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm
+++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm
@@ -542,7 +542,7 @@
 	starting_temp = T20C+20
 
 /obj/effect/abstract/liquid_turf/immutable/Initialize()
-	..()
+	. = ..()
 	reagent_list = starting_mixture.Copy()
 	total_reagents = 0
 	for(var/key in reagent_list)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm
index ac417eec1d9..34ccd01e57e 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm
@@ -77,10 +77,6 @@
 	if(!length(pole_designs))
 		populate_pole_designs()
 
-/obj/structure/pole/ComponentInitialize()
-    . = ..()
-    AddElement(/datum/element/update_icon_updates_onmob)
-
 /obj/structure/pole/update_icon_state()
     . = ..()
     icon_state = "[initial(icon_state)]_[current_pole_color]_[pole_on? "on" : "off"]"