diff --git a/baystation12.dme b/baystation12.dme
index 4c3a843fd02..f6eead40cdb 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -537,7 +537,7 @@
 #include "code\game\machinery\computer\id.dm"
 #include "code\game\machinery\computer\lockdown.dm"
 #include "code\game\machinery\computer\medical.dm"
-#include "code\game\machinery\computer\Operating.dm"
+#include "code\game\machinery\computer\operating.dm"
 #include "code\game\machinery\computer\power.dm"
 #include "code\game\machinery\computer\robot.dm"
 #include "code\game\machinery\computer\security.dm"
diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm
index 17f9dd2c36c..4c0a41d5e55 100644
--- a/code/game/atom_procs.dm
+++ b/code/game/atom_procs.dm
@@ -195,6 +195,7 @@
 			blood_DNA_temp[1] = list(M.dna.unique_enzymes, M.dna.b_type)
 			this.blood_DNA =  blood_DNA_temp
 			this.virus2 = M.virus2
+			this.blood_owner = M
 			for(var/datum/disease/D in M.viruses)
 				var/datum/disease/newDisease = new D.type
 				this.viruses += newDisease
diff --git a/code/modules/DetectiveWork/detective_work.dm b/code/modules/DetectiveWork/detective_work.dm
index bbe23a4a85a..a3ca97e5629 100644
--- a/code/modules/DetectiveWork/detective_work.dm
+++ b/code/modules/DetectiveWork/detective_work.dm
@@ -725,7 +725,7 @@ obj/effect/decal/cleanable/blood/var
 	mob/blood_owner
 
 turf/Exited(mob/living/carbon/human/M)
-	if(istype(M,/mob/living))
+	if(istype(M,/mob/living) && !istype(M,/mob/living/carbon/metroid))
 		if(!istype(src, /turf/space))  // Bloody tracks code starts here
 			if(M.track_blood > 0)
 				M.track_blood--
@@ -737,7 +737,7 @@ turf/Exited(mob/living/carbon/human/M)
 						src.add_bloody_footprints(M.shoes.track_blood_mob,1,M.dir,M.shoes.name) // And bloody tracks end here
 	. = ..()
 turf/Entered(mob/living/carbon/human/M)
-	if(istype(M,/mob/living))
+	if(istype(M,/mob/living) && !istype(M,/mob/living/carbon/metroid))
 		if(M.track_blood > 0)
 			M.track_blood--
 			src.add_bloody_footprints(M.track_blood_mob,0,M.dir,get_tracks(M))
@@ -769,9 +769,14 @@ turf/proc/add_bloody_footprints(mob/living/carbon/human/M,leaving,d,info)
 		if(T.dir == d)
 			if((leaving && T.icon_state == "steps2") || (!leaving && T.icon_state == "steps1"))
 				T.desc = "These bloody footprints appear to have been made by [info]."
-				if(istype(M,/mob/living/carbon/human))
+				if(T.blood_DNA)
 					T.blood_DNA.len++
+				if(istype(M,/mob/living/carbon/human))
 					T.blood_DNA[T.blood_DNA.len] = list(M.dna.unique_enzymes,M.dna.b_type)
+				else if(istype(M,/mob/living/carbon/alien))
+					T.blood_DNA[T.blood_DNA.len] = list("UNKNOWN DNA","X*")
+				else if(istype(M,/mob/living/carbon/monkey))
+					T.blood_DNA[T.blood_DNA.len] = list("Non-human DNA","A+")
 				return
 	var/obj/effect/decal/cleanable/blood/tracks/this = new(src)
 	this.icon = 'footprints.dmi'
@@ -796,6 +801,8 @@ proc/get_tracks(mob/M)
 			. = "monkey paws"
 		else if(istype(M,/mob/living/silicon/robot))
 			. = "robot feet"
+		else if(istype(M,/mob/living/carbon/alien))
+			. = "alien claws"
 		else
 			. = "an unknown creature"