diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 085c72f143..f21d34e4f8 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -244,16 +244,16 @@
 	New()
 		..()
 		new /obj/item/weapon/storage/box/pillbottles(src)
- 		new /obj/item/weapon/storage/box/pillbottles(src)
+		new /obj/item/weapon/storage/box/pillbottles(src)
 		new /obj/item/weapon/storage/box/beakers(src)
 		new /obj/item/weapon/storage/box/autoinjectors(src)
 		new /obj/item/weapon/storage/box/syringes(src)
 		new /obj/item/weapon/reagent_containers/dropper(src)
- 		new /obj/item/weapon/reagent_containers/dropper(src)
- 		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
- 		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
- 		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
- 		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
+		new /obj/item/weapon/reagent_containers/dropper(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
 		return
 
 /obj/structure/closet/secure_closet/psych
@@ -271,20 +271,20 @@
 	New()
 		..()
 		new /obj/item/clothing/under/rank/psych(src)
- 		new /obj/item/clothing/under/rank/psych/turtleneck(src)
- 		new /obj/item/clothing/suit/straight_jacket(src)
- 		new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src)
- 		new /obj/item/weapon/reagent_containers/syringe(src)
- 		new /obj/item/weapon/storage/pill_bottle/citalopram(src)
- 		new /obj/item/weapon/reagent_containers/pill/methylphenidate(src)
- 		new /obj/item/weapon/clipboard(src)
- 		new /obj/item/weapon/folder/white(src)
- 		new /obj/item/device/taperecorder(src)
- 		new /obj/item/device/tape/random(src)
- 		new /obj/item/device/tape/random(src)
- 		new /obj/item/device/tape/random(src)
- 		new /obj/item/device/camera(src)
- 		new /obj/item/toy/plushie/therapy/blue(src)
+		new /obj/item/clothing/under/rank/psych/turtleneck(src)
+		new /obj/item/clothing/suit/straight_jacket(src)
+		new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src)
+		new /obj/item/weapon/reagent_containers/syringe(src)
+		new /obj/item/weapon/storage/pill_bottle/citalopram(src)
+		new /obj/item/weapon/reagent_containers/pill/methylphenidate(src)
+		new /obj/item/weapon/clipboard(src)
+		new /obj/item/weapon/folder/white(src)
+		new /obj/item/device/taperecorder(src)
+		new /obj/item/device/tape/random(src)
+		new /obj/item/device/tape/random(src)
+		new /obj/item/device/tape/random(src)
+		new /obj/item/device/camera(src)
+		new /obj/item/toy/plushie/therapy/blue(src)
 		return
 
 /obj/structure/closet/secure_closet/medical_wall
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index b1d75062a6..1961b1feb3 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -209,8 +209,8 @@
 	desc = "A small glass vial."
 	icon_state = "vial"
 	matter = list("glass" = 250)
- 	w_class = ITEMSIZE_TINY
 	volume = 30
+	w_class = ITEMSIZE_TINY
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25)
 	flags = OPENCONTAINER