diff --git a/code/__HELPERS/custom_holoforms.dm b/code/__HELPERS/custom_holoforms.dm
index 8cc14c64c3..a11b21b4ba 100644
--- a/code/__HELPERS/custom_holoforms.dm
+++ b/code/__HELPERS/custom_holoforms.dm
@@ -34,7 +34,7 @@
 //Errors go to user.
 /proc/generate_custom_holoform_from_prefs_safe(datum/preferences/prefs, mob/user)
 	if(user)
-		if(user.prefs.last_custom_holoform < world.time + CUSTOM_HOLOFORM_DELAY)
+		if(user.client.prefs.last_custom_holoform < world.time + CUSTOM_HOLOFORM_DELAY)
 			return
 	return generate_custom_holoform_from_prefs(prefs, null, null, TRUE)
 
diff --git a/code/modules/client/verbs/custom_holoform.dm b/code/modules/client/verbs/custom_holoform.dm
index aaf4bc53c8..4049d5ff96 100644
--- a/code/modules/client/verbs/custom_holoform.dm
+++ b/code/modules/client/verbs/custom_holoform.dm
@@ -1,8 +1,8 @@
 /client/verb/clear_custom_holoform()
-	set naame = "Clear Custom Holoform"
+	set name = "Clear Custom Holoform"
 	set desc = "Clear your current custom holoform"
 
-	prefs?.custom_holoform = null
+	prefs?.custom_holoform_icon = null
 	to_chat(src, "<span class='boldnotice'>Holoform removed.</span>")
 
 /client/verb/set_custom_holoform()
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index 43de68d7f7..16f397acce 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -91,7 +91,7 @@
 	..()
 	update_resting_icon(resting)
 
-/mob/living/silicon/pai/update_icon()
+/mob/living/silicon/pai/proc/update_icon()
 	if((chassis == "custom") && !custom_holoform_icon)
 		chassis = pick(possible_chassis - "custom")
 	if(chassis != "custom")