diff --git a/code/__defines/is_helpers.dm b/code/__defines/is_helpers.dm
index 6e578517ff..1e353b786b 100644
--- a/code/__defines/is_helpers.dm
+++ b/code/__defines/is_helpers.dm
@@ -84,4 +84,4 @@ GLOBAL_VAR_INIT(magic_appearance_detecting_image, new /image) // appearances are
 /// NaN isn't a number, damn it. Infinity is a problem too.
 #define isnum_safe(x) ( isnum((x)) && !isnan((x)) && !isinf((x)) )
 
-#define ismopable(A) (A && (A.layer <= ABOVE_JUNK_LAYER)) //If something can be cleaned by floor-cleaning devices such as mops or clean bots
+#define ismopable(A) (A && (A.plane <= OBJ_PLANE)) //If something can be cleaned by floor-cleaning devices such as mops or clean bots
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index b13a5ef098..696a1f2be2 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -820,6 +820,6 @@ GLOBAL_LIST_EMPTY(icon_dimensions)
 		blood_DNA = null
 		return TRUE
 
-	blood_color = null // CHOMPEdit - PR this upstream at some point
+	blood_color = null
 	germ_level = 0
 	fluorescent = 0
diff --git a/code/game/objects/items/soap.dm b/code/game/objects/items/soap.dm
index 454b1a4c4a..041a2b3f32 100644
--- a/code/game/objects/items/soap.dm
+++ b/code/game/objects/items/soap.dm
@@ -72,6 +72,7 @@
 			to_chat(user, span_notice("You scrub \the [target.name] clean."))
 			var/turf/T = target
 			T.wash(CLEAN_SCRUB)
+			reagents.trans_to_turf(T, 1, 10)
 			decreaseUses(user)
 	else if(ishuman(target) && user.zone_sel.selecting == O_MOUTH)
 		if(target == user)
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 4ef6feba50..b32080f19e 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -35,6 +35,7 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
 			var/turf/T = get_turf(A)
 			if(T)
 				T.wash(CLEAN_SCRUB)
+				reagents.trans_to_turf(T, 1, 10)
 			to_chat(user, span_notice("You have finished mopping!"))
 
 
@@ -76,4 +77,5 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
 			var/turf/T = get_turf(A)
 			if(T)
 				T.wash(CLEAN_SCRUB)
+				reagents.trans_to_turf(T, 1, 10)
 			to_chat(user, span_notice("You have finished mopping!"))