diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index 9e5abe580cb..900061d9639 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -62,6 +62,9 @@
 					H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/virologist(H), slot_wear_suit)
 					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform)
 					H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask)
+				if("Medical Doctor")
+					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
+					H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit)
 		else
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
 			H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit)
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 2dcfe954ae2..07167e67775 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -396,7 +396,8 @@
 
 /obj/item/weapon/weldingtool/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:organs_by_name[user.zone_sel.selecting]
+		if (!S) return
 		if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help")
 			return ..()
 		if(S.brute_dam)
diff --git a/code/modules/research/xenoarchaeology/artifact_effect.dm b/code/modules/research/xenoarchaeology/artifact_effect.dm
index 87857e2beb3..34f1df0619a 100644
--- a/code/modules/research/xenoarchaeology/artifact_effect.dm
+++ b/code/modules/research/xenoarchaeology/artifact_effect.dm
@@ -60,10 +60,8 @@
 					user << "\blue You feel a soothing energy invigorate you."
 
 					var/mob/living/carbon/human/H = user
-					for(var/A in H.organs)
-						var/datum/organ/external/affecting = null
-						if(!H.organs[A])    continue
-						affecting = H.organs[A]
+					for(var/datum/organ/external/affecting in H.organs)
+						if(!affecting)    continue
 						if(!istype(affecting, /datum/organ/external))    continue
 						affecting.heal_damage(25, 25)    //fixes getting hit after ingestion, killing you when game updates organ health
 						//user:heal_organ_damage(25, 25)