diff --git a/code/modules/mob/living/carbon/human/species/station/unathi_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/unathi_subspecies.dm
index 0987d607814..8ef058c2b9b 100644
--- a/code/modules/mob/living/carbon/human/species/station/unathi_subspecies.dm
+++ b/code/modules/mob/living/carbon/human/species/station/unathi_subspecies.dm
@@ -82,12 +82,12 @@
 		"r_foot" = list("path" = /obj/item/organ/external/foot/right/autakh)
 		)
 
-
 	spawn_flags = IS_RESTRICTED
 	appearance_flags = HAS_HAIR_COLOR | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
 	flags = NO_CHUBBY | NO_SCAN
 
 	flesh_color = "#575757"
+	base_color = "#575757"
 
 	heat_discomfort_level = 290
 	heat_discomfort_strings = list(
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index fe6292e121a..b2c6f25051c 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -33,6 +33,8 @@
 	var/robotic_name
 	var/robotic_sprite
 
+	var/robotize_type		// If set, this organ type will automatically be roboticized with this manufacturer.
+
 /obj/item/organ/New(loc, ...)
 	..()
 	if (!initialized && istype(loc, /mob/living/carbon/human/dummy/mannequin))
@@ -295,8 +297,9 @@
 	robotic = 1
 	min_bruised_damage = 15
 	min_broken_damage = 35
-	name = initial(name)
-	icon_state = initial(icon_state)
+	if(!robotize_type)
+		name = initial(name)
+		icon_state = initial(icon_state)
 
 /obj/item/organ/emp_act(severity)
 	if(!(status & ORGAN_ASSISTED))
@@ -347,6 +350,7 @@
 			msg_admin_attack("[user.name] ([user.ckey]) removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",ckey=key_name(user),ckey_target=key_name(owner))
 		owner.death()
 
+	owner.update_action_buttons()
 	owner = null
 
 /obj/item/organ/proc/replaced(var/mob/living/carbon/human/target,var/obj/item/organ/external/affected)
@@ -373,6 +377,7 @@
 	target.internal_organs_by_name[organ_tag] = src
 	if(robotic)
 		robotize()
+	owner.update_action_buttons()
 
 /obj/item/organ/eyes/replaced(var/mob/living/carbon/human/target)
 
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index af0a20db1a6..f048c3b97c1 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -17,8 +17,6 @@
 	var/brute_mod = 1
 	var/burn_mod = 1
 
-	var/robotize_type		// If set, this organ type will automatically be roboticized with this manufacturer.
-
 	var/icon_name = null
 	var/body_part = null
 	var/icon_position = 0
diff --git a/code/modules/organs/subtypes/autakh.dm b/code/modules/organs/subtypes/autakh.dm
index fc7ad9a2097..a63b5f6968a 100644
--- a/code/modules/organs/subtypes/autakh.dm
+++ b/code/modules/organs/subtypes/autakh.dm
@@ -4,8 +4,8 @@
 	robotize_type = PROSTHETIC_AUTAKH
 
 /obj/item/organ/external/head/autakh/Initialize()
-	mechassist()
 	. = ..()
+	mechassist()
 
 /obj/item/organ/external/chest/autakh
 	dislocated = -1
@@ -13,8 +13,8 @@
 	robotize_type = PROSTHETIC_AUTAKH
 
 /obj/item/organ/external/chest/autakh/Initialize()
-	mechassist()
 	. = ..()
+	mechassist()
 
 /obj/item/organ/external/groin/autakh
 	dislocated = -1
@@ -22,8 +22,8 @@
 	robotize_type = PROSTHETIC_AUTAKH
 
 /obj/item/organ/external/groin/autakh/Initialize()
-	mechassist()
 	. = ..()
+	mechassist()
 
 /obj/item/organ/external/arm/autakh
 	dislocated = -1