diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index fb0788c191..5870c8a780 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -465,6 +465,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 			usr.UnarmedAttack(src, TRUE)
 			if(usr.get_active_held_item() == src)
 				melee_attack_chain(usr, over)
+			usr.FlushCurrentAction()
 			return TRUE //returning TRUE as a "is this overridden?" flag
 	if(!Adjacent(usr) || !over.Adjacent(usr))
 		return // should stop you from dragging through windows
diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm
index 7038e9df7c..cf61e4b210 100644
--- a/code/modules/zombie/items.dm
+++ b/code/modules/zombie/items.dm
@@ -37,11 +37,11 @@
 	if(!proximity_flag)
 		return
 	else
-		if(istype(target, /obj/)) //do far more damage to non mobs so we can get through airlocks
+		if(istype(target, /obj)) //do far more damage to non mobs so we can get through airlocks
 			var/obj/target_object = target
 			target_object.take_damage(force * 3, BRUTE, "melee", 0)
-		else
-			if(isliving(target) && ishuman(target))
+		else if(isliving(target))
+			if(ishuman(target))
 				try_to_zombie_infect(target)
 			else
 				check_feast(target, user)