diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index bf78fde5ae..fee7ba3cb6 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -1,6 +1,3 @@
-//We're really behind tg on traits huh?
-#define HAS_TRAIT(target, trait) (target.status_traits ? (target.status_traits[trait] ? TRUE : FALSE) : FALSE)
-
 //mob traits
 #define TRAIT_BLIND 			"blind"
 #define TRAIT_MUTE				"mute"
diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index 56b3e8bcd2..0337b17c86 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -232,6 +232,7 @@
 
 /datum/component/mood/proc/IncreaseSanity(amount, maximum = SANITY_NEUTRAL)
 	// Disturbed stops you from getting any more sane - I'm just gonna bung this in here
+	var/mob/living/owner = parent
 	if(owner.has_trait(TRAIT_UNSTABLE))
 		return
 	if(sanity > maximum)
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 2841590abf..b405944802 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -301,15 +301,15 @@
 	name = "bottle of psicodine pills"
 	desc = "Contains pills used to treat mental distress and traumas."
 
- /obj/item/storage/pill_bottle/psicodine/PopulateContents()
+/obj/item/storage/pill_bottle/psicodine/PopulateContents()
 	for(var/i in 1 to 7)
 		new /obj/item/reagent_containers/pill/psicodine(src)
 
- /obj/item/storage/pill_bottle/happiness
+/obj/item/storage/pill_bottle/happiness
 	name = "happiness pill bottle"
 	desc = "The label is long gone, in its place an 'H' written with a marker."
 
- /obj/item/storage/pill_bottle/happiness/PopulateContents()
+/obj/item/storage/pill_bottle/happiness/PopulateContents()
 	for(var/i in 1 to 5)
 		new /obj/item/reagent_containers/pill/happiness(src)