diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm
index 15fbb697438..cff880dfe9b 100644
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -85,6 +85,7 @@
 	name = "fabricated machete"
 	desc = "A long, machine-stamped blade with a somewhat ungainly handle. Found in military surplus stores, malls, and horror movies since before interstellar travel."
 	base_parry_chance = 40
+	material = /decl/material/solid/metal/steel
 	matter = list(/decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT)
 
 /obj/item/hatchet/machete/Initialize()
diff --git a/code/modules/economy/worth_guns.dm b/code/modules/economy/worth_guns.dm
index 369a34a5710..0b0071243d1 100644
--- a/code/modules/economy/worth_guns.dm
+++ b/code/modules/economy/worth_guns.dm
@@ -25,7 +25,9 @@
 	. = ..()
 	if(self_recharge)
 		. += 100
-	var/projectile_value = atom_info_repository.get_combined_worth_for(projectile_type)
+	var/projectile_value = 1
+	if(projectile_type)
+		projectile_value = atom_info_repository.get_combined_worth_for(projectile_type)
 	for(var/datum/firemode/F in firemodes)
 		if(F.settings["projectile_type"])
 			projectile_value = max(projectile_value, atom_info_repository.get_combined_worth_for(F.settings["projectile_type"]))
@@ -34,11 +36,12 @@
 /obj/item/gun/projectile/get_base_value()
 	. = ..()
 	if(load_method & (SINGLE_CASING|SPEEDLOADER))
-		var/projectile_value = atom_info_repository.get_combined_worth_for(ammo_type)
+		var/projectile_value = ammo_type ? atom_info_repository.get_combined_worth_for(ammo_type) : 1
 		. += 0.5 * projectile_value * max_shells
 	else if(load_method & MAGAZINE)
 		if(auto_eject)
 			. += 20
 		var/obj/item/ammo_magazine/mag = magazine_type
-		var/projectile_value = atom_info_repository.get_combined_worth_for(initial(mag.ammo_type))
-		. += 0.5 * projectile_value * initial(mag.max_ammo)
\ No newline at end of file
+		var/mag_type = initial(mag.ammo_type)
+		var/projectile_value = mag_type ? atom_info_repository.get_combined_worth_for(mag_type) : 1
+		. += 0.5 * projectile_value * initial(mag.max_ammo)
diff --git a/code/modules/fabrication/designs/general/designs_arms_ammo.dm b/code/modules/fabrication/designs/general/designs_arms_ammo.dm
index 0960b0f03f7..2f7b229f224 100644
--- a/code/modules/fabrication/designs/general/designs_arms_ammo.dm
+++ b/code/modules/fabrication/designs/general/designs_arms_ammo.dm
@@ -11,7 +11,7 @@
 
 /datum/fabricator_recipe/arms_ammo/flaregun
 	name = "flare gun"
-	path = /obj/item/weapon/gun/projectile/flare
+	path = /obj/item/gun/projectile/flare
 
 /datum/fabricator_recipe/arms_ammo/hidden
 	path = /obj/item/hatchet/machete/steel
@@ -73,4 +73,4 @@
 
 /datum/fabricator_recipe/arms_ammo/hidden/speedloader_laser
 	name = "ammunition (speedloader, laserbulb)"
-	path = /obj/item/ammo_magazine/laser_revolver
\ No newline at end of file
+	path = /obj/item/ammo_magazine/speedloader/laser_revolver
\ No newline at end of file
diff --git a/nebula.dme b/nebula.dme
index 36bd2d696d9..2f72bd96be4 100644
--- a/nebula.dme
+++ b/nebula.dme
@@ -1832,6 +1832,7 @@
 #include "code\modules\fabrication\fabricator_topic.dm"
 #include "code\modules\fabrication\fabricator_ui.dm"
 #include "code\modules\fabrication\designs\_design.dm"
+#include "code\modules\fabrication\designs\general\designs_arms_ammo.dm"
 #include "code\modules\fabrication\designs\general\designs_devices_components.dm"
 #include "code\modules\fabrication\designs\general\designs_engineering.dm"
 #include "code\modules\fabrication\designs\general\designs_general.dm"