diff --git a/code/datums/components/traits/crowd_detection.dm b/code/datums/components/traits/crowd_detection.dm
index cda8198525..4d11158b01 100644
--- a/code/datums/components/traits/crowd_detection.dm
+++ b/code/datums/components/traits/crowd_detection.dm
@@ -96,10 +96,10 @@
 	var/list/in_range = list()
 	if(!istype(M))
 		return in_range
-	var/social_check = only_people && !istype(M, /mob/living/carbon) && !istype(M, /mob/living/silicon/robot) && !istype(M, /mob/living/silicon/pai)
+	var/social_check = only_people && !iscarbon(M) && !isrobot(M) && !ispAI(M)
 	var/self_invisible_check = M == human_parent || M.invisibility > human_parent.see_invisible
 	var/ckey_check = only_people && !M.ckey
-	var/overall_checks = M == human_parent || M.stat == DEAD || social_check || ckey_check
+	var/overall_checks = M == human_parent || M.stat == DEAD || social_check || ckey_check || (ispAI(M) && !M.ckey)
 	if(invis_matters && self_invisible_check)
 		return in_range
 	if((M.faction == FACTION_NEUTRAL || M.faction == human_parent.faction) && !overall_checks)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 89e8f13e18..b5fe9edd71 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -224,7 +224,7 @@
 /mob/living/silicon/pai/proc/change_chassis(new_chassis)
 	if(!(new_chassis in SSpai.get_chassis_list()))
 		new_chassis = PAI_DEFAULT_CHASSIS
-	var/datum/pai_sprite/chassis_data = SSpai.chassis_data(chassis_name)
+	var/datum/pai_sprite/chassis_data = SSpai.chassis_data(new_chassis)
 	if(chassis_data.emagged && !src.card.emagged)
 		return
 	chassis_name = new_chassis
@@ -260,6 +260,7 @@
 	resize(1, FALSE, TRUE, TRUE, FALSE)
 
 	icon = chassis_data.sprite_icon
+	icon_state = chassis_data.sprite_icon_state
 	pixel_x = chassis_data.pixel_x
 	default_pixel_x = pixel_x
 	pixel_y = chassis_data.pixel_y