diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index cf453ed7909..e8ca0524f01 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -63,9 +63,8 @@
 				if(health >= config.health_threshold_crit)
 					if(src.surgeries.len)
 						for(var/datum/surgery/S in src.surgeries)
-							if(istype(S.get_surgery_step(), /datum/surgery_step/cavity/place_item) || istype(S.get_surgery_step(),/datum/surgery_step/remove_object))
-								if(S.next_step(M, src))
-									return 1
+							if(S.next_step(M, src))
+								return 1
 							else
 								help_shake_act(M)
 								add_logs(src, M, "shaked")
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index a2460bf3a2b..6dcd76bedfa 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -61,7 +61,7 @@
 			return
 	var/save_sight = owner.sight
 	owner.sight &= 0
-	owner.disabilities |= BLIND
+	owner.sdisabilities |= BLIND
 	owner << "<span class='warning'>Static obfuscates your vision!</span>"
 	spawn(60 / severity)
 		if(owner)
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 59c42912f25..3a71b128a79 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -376,6 +376,10 @@
 	health = 3
 	var/organhonked = 0
 
+/obj/item/organ/internal/honktumor/New()
+	..()
+	processing_objects.Add(src)
+
 /obj/item/organ/internal/honktumor/insert(mob/living/carbon/M, special = 0)
 	..()
 	M.mutations.Add(CLUMSY)
@@ -388,11 +392,15 @@
 
 	M.mutations.Remove(CLUMSY)
 	M.mutations.Remove(COMICBLOCK)
-	genemutcheck(M,COMICBLOCK,null,MUTCHK_FORCED)
+
+/obj/item/organ/internal/honktumor/Destroy()
+	processing_objects.Remove(src)
+	..()
+
+/obj/item/organ/internal/honktumor/process()
 	if(isturf(loc))
 		visible_message("<span class='warning'>[src] honks in on itself!</span>")
-		playsound(src, 'sound/items/AirHorn.ogg', 100, 1)
-		new /obj/item/weapon/bananapeel(get_turf(src.loc))
+		new /obj/item/weapon/bananapeel(get_turf(loc))
 		qdel(src)