diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm
index ae6b53d4f2a..b913119a575 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -197,7 +197,7 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
 	if(!src.target || src.target == null)
 		for (var/obj/effect/decal/cleanable/D in view(7,src))
 			for(var/T in src.target_types)
-				if(isnull(D.targeted_by) && (D.type == T || D.parent_type == T) && D != src.oldtarget)   // If the mess isn't targeted
+				if(isnull(D.targeted_by) && istype(D, T) && D != src.oldtarget)   // If the mess isn't targeted (D.type == T || D.parent_type == T)
 					src.oldtarget = D								 // or if it is but the bot is gone.
 					src.target = D									 // and it's stuff we clean?  Clean it.
 					D.targeted_by = src	// Claim the mess we are targeting.
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 9605cfa7a53..9451334c3c4 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -4,7 +4,9 @@ var/global/list/image/splatter_cache=list()
 
 /obj/effect/decal/cleanable/blood
 	name = "blood"
+	var/dryname = "dried blood"
 	desc = "It's thick and gooey. Perhaps it's the chef's cooking?"
+	var/drydesc = "It's dry and crusty. Someone is not doing their job."
 	gender = PLURAL
 	density = 0
 	anchored = 1
@@ -81,10 +83,10 @@ var/global/list/image/splatter_cache=list()
 	amount--
 
 /obj/effect/decal/cleanable/blood/proc/dry()
-		name = "dried [src.name]"
-		desc = "It's dry and crusty. Someone is not doing their job."
-		color = adjust_brightness(color, -50)
-		amount = 0
+	name = dryname
+	desc = drydesc
+	color = adjust_brightness(color, -50)
+	amount = 0
 
 /obj/effect/decal/cleanable/blood/attack_hand(mob/living/carbon/human/user)
 	..()
diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm
index 0382e3dbc99..d781b4a4f4c 100644
--- a/code/game/objects/effects/decals/Cleanable/tracks.dm
+++ b/code/game/objects/effects/decals/Cleanable/tracks.dm
@@ -143,16 +143,25 @@ var/global/list/image/fluidtrack_cache=list()
 			overlays += I
 		updatedtracks=0 // Clear our memory of updated tracks.
 
+/obj/effect/decal/cleanable/blood/tracks/New()
+	..()
+	spawn(DRYING_TIME)
+		dry()
+
 /obj/effect/decal/cleanable/blood/tracks/footprints
 	name = "wet footprints"
+	dryname = "dried footprints"
 	desc = "Whoops..."
+	drydesc = "Whoops..."
 	coming_state = "human1"
 	going_state  = "human2"
 	amount = 0
 
 /obj/effect/decal/cleanable/blood/tracks/wheels
 	name = "wet tracks"
+	dryname = "dried tracks"
 	desc = "Whoops..."
+	drydesc = "Whoops..."
 	coming_state = "wheels"
 	going_state  = ""
 	desc = "They look like tracks left by wheels."