diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm
index 4765389ec07..1f2af52ea38 100644
--- a/code/game/machinery/defib_mount.dm
+++ b/code/game/machinery/defib_mount.dm
@@ -15,7 +15,7 @@
 	var/clamps_locked = FALSE //if true, and a defib is loaded, it can't be removed without unlocking the clamps
 
 /obj/machinery/defibrillator_mount/New(location, direction, building = 0)
-	. = ..()
+	..()
 
 	if(location)
 		loc = location
@@ -29,13 +29,13 @@
 
 
 /obj/machinery/defibrillator_mount/loaded/New() //loaded subtype for mapping use
-	. = ..()
+	..()
 	defib = new/obj/item/defibrillator/loaded(src)
 	update_icon()
 
 /obj/machinery/defibrillator_mount/Destroy()
 	QDEL_NULL(defib)
-	. = ..()
+	return ..()
 
 /obj/machinery/defibrillator_mount/examine(mob/user)
 	..()
@@ -116,12 +116,12 @@
 		else
 			to_chat(user, "<span class='warning'>Insufficient access.</span>")
 		return
-	..()
+	return ..()
 
 /obj/machinery/defibrillator_mount/AltClick(mob/living/carbon/user)
 	if(!istype(user))
 		return
-	if(user.stat || user.restrained())
+	if(user.incapacitated())
 		return
 	if(!Adjacent(user))
 		return
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index eb939a05753..a8bbbd18fb1 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -27,14 +27,14 @@
 		return
 
 	if(Adjacent(target) && usr.Adjacent(target))
-		bag.afterattack(target, usr, 1)
+		bag.afterattack(target, usr, TRUE)
 
 /obj/machinery/iv_drip/attack_hand(mob/user)
 	if(bag)
 		user.put_in_hands(bag)
-	bag.update_icon()
-	bag = null
-	update_icon()
+		bag.update_icon()
+		bag = null
+		update_icon()
 
 /obj/machinery/iv_drip/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/reagent_containers/iv_bag))
@@ -50,7 +50,7 @@
 		update_icon()
 	else if (bag && istype(I, /obj/item/reagent_containers))
 		bag.attackby(I)
-		I.afterattack(bag, usr, 1)
+		I.afterattack(bag, usr, TRUE)
 		update_icon()
 	else
 		return ..()
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 0d2472691e7..838e9fbedd9 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -196,7 +196,7 @@
 	desc = "A box full of empty IV bags."
 	icon_state = "beaker"
 
-	New()
+/obj/item/storage/box/iv_bags/New()
 		..()
 		new /obj/item/reagent_containers/iv_bag( src )
 		new /obj/item/reagent_containers/iv_bag( src )
diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm
index 5946e646d19..78f0438efba 100644
--- a/code/modules/reagents/reagent_containers/iv_bag.dm
+++ b/code/modules/reagents/reagent_containers/iv_bag.dm
@@ -81,9 +81,8 @@
 	if(!target.reagents)
 		return
 
-	var/mob/living/L
 	if(isliving(target))
-		L = target
+		var/mob/living/L = target
 		if(injection_target) // Removing the needle
 			if(L != injection_target)
 				to_chat(user, "<span class='notice'>[src] is already inserted into [injection_target]'s arm!")
@@ -142,18 +141,18 @@
 /obj/item/reagent_containers/iv_bag/salglu/New()
 	..()
 	set_label("Saline-Glucose")
-	reagents.add_reagent("salglu_solution", 200)
+	reagents = list_reagents = list("salglu_solution" = 200)
 	update_icon()
 
 /obj/item/reagent_containers/iv_bag/blood // Don't use this - just an abstract type to allow blood bags to have a common blood_type var for ease of creation.
 	var/blood_type
+	amount_per_transfer_from_this = 5 // Bloodbags are set to transfer 5 units by default.
 
 /obj/item/reagent_containers/iv_bag/blood/New()
 	..()
 	if(blood_type != null)
 		set_label(blood_type)
 		reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
-		amount_per_transfer_from_this = 5 // Bloodbags are set to transfer 5 units by default.
 		update_icon()