diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index a15e28a2003..cd4abb9900d 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -330,7 +330,7 @@ var/list/organ_cache = list()
 	var/obj/item/organ/external/affected = owner.get_organ(parent_organ)
 	if(affected) affected.internal_organs -= src
 
-	loc = get_turf(owner)
+	loc = owner.drop_location()
 	processing_objects |= src
 	rejecting = null
 	var/datum/reagent/blood/organ_blood = locate(/datum/reagent/blood) in reagents.reagent_list
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 4f85ee689d6..8ffe98377e8 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -816,7 +816,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 
 	if(!cannot_amputate)
 		if(nonsolid && damage >= max_damage)
-			droplimb(TRUE, DROPLIMB_BLUNT)
+			droplimb(TRUE, DROPLIMB_EDGE)
 		//VOREStation Add Start
 		if(robotic >= ORGAN_NANOFORM && damage >= max_damage)
 			droplimb(TRUE, DROPLIMB_BURN)