diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm
index df0a4d533b2..aef888f3893 100644
--- a/code/modules/mob/living/simple_animal/borer.dm
+++ b/code/modules/mob/living/simple_animal/borer.dm
@@ -294,7 +294,7 @@
 		if(!host || !src) return
 
 		if(src.stat)
-			src << "You cannot infest a target in your current state."
+			src << "You cannot release a target in your current state."
 			return
 
 		src << "You wiggle out of [host]'s ear and plop to the ground."
@@ -360,7 +360,7 @@ mob/living/simple_animal/borer/proc/detatch()
 
 	if(!host)	return
 
-	src.loc = get_turf(host)
+	src.forceMove(get_turf(host))
 
 	reset_view(null)
 	machine = null
@@ -426,7 +426,7 @@ mob/living/simple_animal/borer/proc/detatch()
 			M << "Something disgusting and slimy wiggles into your ear!"
 
 		src.host = M
-		src.loc = M
+		src.forceMove(M)
 
 		if(istype(M,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = M
@@ -442,7 +442,7 @@ mob/living/simple_animal/borer/proc/detatch()
 
 /mob/living/simple_animal/borer/proc/perform_infestation(var/mob/living/carbon/M)
 	src.host = M
-	src.loc = M
+	src.forceMove(M)
 
 	if(istype(M,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm
index d4d51e41f76..80223eafe04 100644
--- a/code/modules/surgery/implant.dm
+++ b/code/modules/surgery/implant.dm
@@ -155,7 +155,7 @@
 		..()
 
 	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
+		var/obj/item/organ/external/affected = target.get_organ(target_zone)
 
 		var/find_prob = 0
 
@@ -185,6 +185,7 @@
 					if(worm.controlling)
 						target.release_control()
 					worm.detatch()
+					worm.leave_host()
 
 				obj.loc = get_turf(target)
 				if(istype(obj,/obj/item/weapon/implant))