diff --git a/code/modules/cargo/supplypacks/supply.dm b/code/modules/cargo/supplypacks/supply.dm
index d078bc11675..1b4154823e4 100644
--- a/code/modules/cargo/supplypacks/supply.dm
+++ b/code/modules/cargo/supplypacks/supply.dm
@@ -77,7 +77,7 @@
 			/obj/item/folder/yellow,
 			/obj/item/hand_labeler,
 			/obj/item/duct_tape_roll,
-			/obj/structure/filingcabinet/chestdrawer{anchored = 0},
+			/obj/structure/filingcabinet/chestdrawer/unanchored,
 			/obj/item/paper_bin
 			)
 	name = "Office supplies"
diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm
index eed14493c91..1ed62eadfc1 100644
--- a/code/modules/error_handler/error_handler.dm
+++ b/code/modules/error_handler/error_handler.dm
@@ -5,7 +5,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 #ifdef USE_CUSTOM_ERROR_HANDLER
 #define ERROR_USEFUL_LEN 2
 /world/Error(exception/E, datum/e_src)
-	++global.total_runtimes
+	global.total_runtimes++
 
 	if(!istype(E)) //Something threw an unusual exception
 		log_world("uncaught runtime error: [E]")
diff --git a/code/modules/reagents/machinery/dispenser/dispenser2.dm b/code/modules/reagents/machinery/dispenser/dispenser2.dm
index a9e21cd5a50..41ec46705d1 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser2.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser2.dm
@@ -192,3 +192,6 @@
 	if(stat & BROKEN)
 		return
 	ui_interact(user)
+
+/obj/machinery/chemical_dispenser/unanchored
+	anchored = FALSE
diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm
index 437685d5ba3..95a0f09ffa4 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm
@@ -25,6 +25,9 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/calcium
 		)
 
+/obj/machinery/chemical_dispenser/full/unanchored
+	anchored = FALSE
+
 /obj/machinery/chemical_dispenser/ert
 	name = "medicine dispenser"
 	spawn_cartridges = list(
@@ -89,6 +92,9 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/sarsaparilla
 		)
 
+/obj/machinery/chemical_dispenser/bar_soft/unanchored
+	anchored = FALSE
+
 /obj/machinery/chemical_dispenser/bar_alc
 	name = "booze dispenser"
 	desc = "A beer machine. Like a soda machine, but more fun!"
@@ -121,6 +127,9 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/alcsassafras
 		)
 
+/obj/machinery/chemical_dispenser/bar_alc/unanchored
+	anchored = FALSE
+
 /obj/machinery/chemical_dispenser/bar_coffee
 	name = "coffee dispenser"
 	desc = "Driving crack dealers out of employment since 2280."
@@ -146,3 +155,6 @@
 			// /obj/item/reagent_containers/chem_disp_cartridge/greentea,
 			// /obj/item/reagent_containers/chem_disp_cartridge/decaf
 		)
+
+/obj/machinery/chemical_dispenser/bar_coffee/unanchored
+	anchored = FALSE
diff --git a/code/modules/reagents/machinery/dispenser/supply.dm b/code/modules/reagents/machinery/dispenser/supply.dm
index 5f28d2dc4bd..12d2135495b 100644
--- a/code/modules/reagents/machinery/dispenser/supply.dm
+++ b/code/modules/reagents/machinery/dispenser/supply.dm
@@ -1,7 +1,7 @@
 /datum/supply_pack/chemistry_dispenser
 	name = "Reagent dispenser"
 	contains = list(
-			/obj/machinery/chemical_dispenser{anchored = 0}
+			/obj/machinery/chemical_dispenser/unanchored
 		)
 	cost = 25
 	container_type = /obj/structure/largecrate
@@ -11,7 +11,7 @@
 /datum/supply_pack/beer_dispenser
 	name = "Booze dispenser"
 	contains = list(
-			/obj/machinery/chemical_dispenser/bar_alc{anchored = 0}
+			/obj/machinery/chemical_dispenser/bar_alc/unanchored
 		)
 	cost = 25
 	container_type = /obj/structure/largecrate
@@ -21,7 +21,7 @@
 /datum/supply_pack/soda_dispenser
 	name = "Soda dispenser"
 	contains = list(
-			/obj/machinery/chemical_dispenser/bar_soft{anchored = 0}
+			/obj/machinery/chemical_dispenser/bar_soft/unanchored
 		)
 	cost = 25
 	container_type = /obj/structure/largecrate