diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm
index 597e8921240..118220799a1 100644
--- a/code/modules/events/wizard/departmentrevolt.dm
+++ b/code/modules/events/wizard/departmentrevolt.dm
@@ -8,9 +8,9 @@
 /datum/round_event/wizard/deprevolt/start()
 
 	var/list/tidecolor
-	var/list/jobs_to_revolt
+	var/list/jobs_to_revolt	= 	list()
 	var/nation
-	var/list/citizens
+	var/list/citizens	=		list()
 
 	tidecolor = pick("grey", "white", "yellow", "purple", "brown", "whatevercolorrepresentstheservicepeople")
 	switch(tidecolor)
@@ -36,12 +36,18 @@
 	nation += pick("stan", "topia", "land")
 
 	for(var/mob/living/carbon/human/H in mob_list)
-		if(H.mind && H.mind.assigned_role in jobs_to_revolt && !(H.mind in ticker.mode.traitors))
-			citizens += H
-			ticker.mode.traitors += H.mind
-			H.mind.special_role = "separatist"
-			H.attack_log += "\[[time_stamp()]\] <font color='red'>Was made into a separatist, long live [nation]!</font>"
-			H << "<B>You are a separatist! [nation] forever! Protect the soverignty of your newfound land with your comrades in arms!</B>"
-
-	if(citizens)
-		message_admins("The nation of [nation] has been formed. Affected jobs are [jobs_to_revolt].")
\ No newline at end of file
+		if(H.mind)
+			var/datum/mind/M = H.mind
+			if(M.assigned_role && !(M in ticker.mode.traitors))
+				for(var/job in jobs_to_revolt)
+					if(M.assigned_role == job)
+						citizens += H
+						ticker.mode.traitors += M
+						M.special_role = "separatist"
+						H.attack_log += "\[[time_stamp()]\] <font color='red'>Was made into a separatist, long live [nation]!</font>"
+						H << "<B>You are a separatist! [nation] forever! Protect the soverignty of your newfound land with your comrades in arms!</B>"
+	if(citizens.len)
+		var/message
+		for(var/job in jobs_to_revolt)
+			message += "[job],"
+		message_admins("The nation of [nation] has been formed. Affected jobs are [message]")
\ No newline at end of file
diff --git a/code/modules/events/wizard/imposter.dm b/code/modules/events/wizard/imposter.dm
index 3d2b538d727..d12f57e3d7c 100644
--- a/code/modules/events/wizard/imposter.dm
+++ b/code/modules/events/wizard/imposter.dm
@@ -24,12 +24,12 @@
 		I.dna.uni_identity = W.dna.uni_identity
 		I.dna.struc_enzymes = W.dna.struc_enzymes
 		updateappearance(I)
-		if(W.ears)		I.equip_to_slot_or_del(new W.ears(I), slot_ears)
-		if(W.w_uniform)	I.equip_to_slot_or_del(new W.w_uniform(I), slot_w_uniform)
-		if(W.shoes)		I.equip_to_slot_or_del(new W.shoes(I), slot_shoes)
-		if(W.wear_suit)	I.equip_to_slot_or_del(new W.wear_suit(I), slot_wear_suit)
-		if(W.head)		I.equip_to_slot_or_del(new W.head(I), slot_head)
-		if(W.back)		I.equip_to_slot_or_del(new W.back(I), slot_back)
+		if(W.ears)		I.equip_to_slot_or_del(new W.ears.type, slot_ears)
+		if(W.w_uniform)	I.equip_to_slot_or_del(new W.w_uniform.type	, slot_w_uniform)
+		if(W.shoes)		I.equip_to_slot_or_del(new W.shoes.type, slot_shoes)
+		if(W.wear_suit)	I.equip_to_slot_or_del(new W.wear_suit.type, slot_wear_suit)
+		if(W.head)		I.equip_to_slot_or_del(new W.head.type, slot_head)
+		if(W.back)		I.equip_to_slot_or_del(new W.back.type, slot_back)
 		I.key = C.key
 
 		//Operation: Fuck off and scare people