diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index affb125eb0ce..0f11ca369f71 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -37,9 +37,6 @@
 	//Detective Work, used for the duplicate data points kept in the scanners
 	var/list/original_atom
 
-	//Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default
-	var/can_leave_fibers = TRUE
-
 	var/admin_spawned = FALSE	//was this spawned by an admin? used for stat tracking stuff.
 
 	var/initialized = FALSE
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index d061aaf0f713..c8ebcbb7b0d6 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -39,6 +39,9 @@
 	var/blockTracking
 	w_class = WEIGHT_CLASS_SMALL
 
+	/// Detective Work, used for allowing a given atom to leave its fibers on stuff. Allowed by default
+	var/can_leave_fibers = TRUE
+
 /obj/item/clothing/update_icon_state()
 	if(!can_toggle)
 		return
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index f70deb5ab420..d6b74d07a08f 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -29,10 +29,10 @@
 
 	//Equipment slots
 	var/obj/item/clothing/under/w_uniform = null
-	var/obj/item/shoes = null
+	var/obj/item/clothing/shoes = null
 	var/obj/item/belt = null
-	var/obj/item/gloves = null
-	var/obj/item/glasses = null
+	var/obj/item/clothing/gloves = null
+	var/obj/item/clothing/glasses = null
 	var/obj/item/l_ear = null
 	var/obj/item/r_ear = null
 	var/obj/item/wear_id = null