diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index ffb73ef359f..753d2bd2d6c 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -41,7 +41,7 @@
 			user << "<span class='warning'>You aren't sure where this brain came from, but you're pretty sure it's a useless brain!</span>"
 			return
 
-		if(!user.unEquip(src))
+		if(!user.unEquip(O))
 			return
 		var/mob/living/carbon/brain/B = newbrain.brainmob
 		if(!B.key)
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 76365b0790c..2c7f7ddbec4 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -77,9 +77,9 @@
 	return 1
 
 /datum/surgery_step/saw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
-	if(ishuman(target))
-		var/mob/living/carbon/human/H = target
-		H.apply_damage(75,"brute","[target_zone]")
+	if(ishuman(target) || ismonkey(target) || isalienadult(target))
+		var/mob/living/carbon/M = target
+		M.apply_damage(75,"brute","[target_zone]")
 		user.visible_message("[user] saws [target]'s [parse_zone(target_zone)] open!", "<span class='notice'>You saw [target]'s [parse_zone(target_zone)] open.</span>")
 		feedback_add_details("surgery_step_success","[src.type]")
 	return 1