diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index e3fedecc1d..06fb316524 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -362,7 +362,7 @@
 	. = ..()
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_items = 6
-	STR.set_holdable(list(/obj/item/clothing/mask/cigarette, /obj/item/lighter, /obj/item/gun/ballistic/derringer, /obj/item/ammo_casing/a357, /obj/item/ammo_casing/g4570))
+	STR.can_hold = typecacheof(list(/obj/item/clothing/mask/cigarette, /obj/item/lighter, /obj/item/gun/ballistic/derringer, /obj/item/ammo_casing/a357, /obj/item/ammo_casing/g4570))
 
 /obj/item/storage/fancy/cigarettes/derringer/AltClick(mob/living/carbon/user)
 	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
diff --git a/code/modules/projectiles/boxes_magazines/internal/derringer.dm b/code/modules/projectiles/boxes_magazines/internal/derringer.dm
index f2dd39ee3c..acaaa6d0a1 100644
--- a/code/modules/projectiles/boxes_magazines/internal/derringer.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/derringer.dm
@@ -11,7 +11,7 @@
 	max_ammo = 2
 	multiload = FALSE
 
-/obj/item/ammo_box/internal/derr4570
+/obj/item/ammo_box/magazine/internal/derr4570
 	name = "\improper derringer muzzle"
 	ammo_type = /obj/item/ammo_casing/g4570
 	caliber = "45-70"
diff --git a/code/modules/uplink/uplink_items/uplink_stealth.dm b/code/modules/uplink/uplink_items/uplink_stealth.dm
index 25d90a0c2d..b55343546e 100644
--- a/code/modules/uplink/uplink_items/uplink_stealth.dm
+++ b/code/modules/uplink/uplink_items/uplink_stealth.dm
@@ -54,7 +54,7 @@ datum/uplink_item/stealthy_weapons/derringerpack
 datum/uplink_item/stalthy_weapons/derringerpack_nukie
 	name = "Antique Derringer"
 	desc = "An easy to conceal, yet extremely deadly handgun, capable of firing .45-70 Govt rounds. Comes in a unique pack of cigarettes with additional munitions."
-	item = /obj/storage/fancy/cigarettes/derringer/midworld
+	item = /obj/item/storage/fancy/cigarettes/derringer/midworld
 	include_modes = list(/datum/game_mode/nuclear)
 	cost = 10
 	surplus = 2
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 88c7e848dc..9d9279f148 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ