diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm
index 2c25e4d7613..b942b0cabe7 100644
--- a/code/modules/mob/living/update_status.dm
+++ b/code/modules/mob/living/update_status.dm
@@ -86,7 +86,7 @@
 /mob/living/update_canmove(delay_action_updates = 0)
 	var/fall_over = !can_stand()
 	var/buckle_lying = !(buckled && !buckled.buckle_lying)
-	if(fall_over || resting || stunned)
+	if(fall_over || resting || stunned || (buckled && buckle_lying != 0))
 		drop_r_hand()
 		drop_l_hand()
 	else
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 4c8001c9f76..bc579f5387c 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -11,6 +11,9 @@
 								/obj/item/weldingtool = 30
 								)
 
+		if(M == user)
+			return // no self surgery
+
 		if(istype(M, /mob/living/carbon/human))
 			H = M
 			affecting = H.get_organ(check_zone(selected_zone))