diff --git a/code/WorkInProgress/autopsy.dm b/code/WorkInProgress/autopsy.dm
index 7d1b647c87..2e59beec5c 100644
--- a/code/WorkInProgress/autopsy.dm
+++ b/code/WorkInProgress/autopsy.dm
@@ -174,7 +174,7 @@
 
 	src.timeofdeath = M.timeofdeath
 
-	var/datum/organ/external/S = M.organs[user.zone_sel.selecting]
+	var/datum/organ/external/S = M.get_organ(user.zone_sel.selecting)
 	if(!S)
 		usr << "<b>You can't scan this body part.</b>"
 		return
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index d486c602a5..92522f701b 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -491,8 +491,7 @@
 						updatehealth()
 							
 				if(damage && organs.len)
-					var/V = pick(organs)
-					var/datum/organ/external/O = organs[V]
+					var/datum/organ/external/O = pick(organs)
 					if(istype(O)) O.add_autopsy_data("Radiation Poisoning", damage)
 
 	proc/breathe()
@@ -1074,16 +1073,14 @@
 
 		if(life_tick % 10 == 0)
 			// handle trace chemicals for autopsy
-			for(var/V in organs)
-				var/datum/organ/O = organs[V]
+			for(var/datum/organ/O in organs)
 				for(var/chemID in O.trace_chemicals)
 					O.trace_chemicals[chemID] = O.trace_chemicals[chemID] - 1
 					if(O.trace_chemicals[chemID] <= 0)
 						O.trace_chemicals.Remove(chemID)
 		for(var/datum/reagent/A in reagents.reagent_list)
 			// add chemistry traces to a random organ
-			var/V = pick(organs)
-			var/datum/organ/O = organs[V]
+			var/datum/organ/O = pick(organs)
 			O.trace_chemicals[A.name] = 100
 
 		updatehealth()
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 307314e42d..3bc626696d 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -527,7 +527,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
 
 /obj/item/weapon/cable_coil/attack(mob/M as mob, mob/user as mob)
 	if(hasorgans(M))
-		var/datum/organ/external/S = M:organs[user.zone_sel.selecting]
+		var/datum/organ/external/S = M:get_organ(user.zone_sel.selecting)
 		if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help")
 			return ..()
 		if(S.burn_dam > 0)