diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 9d59022c403..f00f70237f1 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -202,7 +202,7 @@
 
 			if(!src.head.law_manager)
 
-				if(!is_alien_whitelisted(M.brainmob, src.chest.linked_frame) && config.usealienwhitelist)
+				if(!is_alien_whitelisted(M.brainmob, "Baseline Frame") && config.usealienwhitelist)
 					user << "<span class='warning'>\The [W] does not seem to fit.</span>"
 					return
 
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index b2de0d7a4d4..f210134ece9 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -683,7 +683,7 @@ default behaviour is:
 	if (last_resist + 4 > world.time)
 		return
 	last_resist = world.time
-	if (stat || paralysis || stunned)
+	if(stunned > 10)
 		src << "<span class='notice'>You can't move...</span>"
 		return
 	var/resisting = 0
diff --git a/icons/mob/custom_synthetic.dmi b/icons/mob/custom_synthetic.dmi
index 30168319e0c..6f5f7f4d9e3 100644
Binary files a/icons/mob/custom_synthetic.dmi and b/icons/mob/custom_synthetic.dmi differ