diff --git a/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs b/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs
index 4b51ce78f..647886e14 100644
--- a/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs
+++ b/wadsrc/static/zscript/actors/doom/id24/id24calamityblade.zs
@@ -22,8 +22,9 @@ class ID24CalamityBlade : DoomWeapon // Heatwave Generator
 	{
 		Weapon.SelectionOrder 1000;
 		Weapon.AmmoUse 10;
-		Weapon.AmmoGive 40;
+		Weapon.AmmoGive 20;
 		Weapon.AmmoType "ID24Fuel";
+		+Weapon.NoAutoAim;
 		Inventory.PickupMessage "$ID24_GOTCALAMITYBLADE";
 		Tag "$TAG_ID24CALAMITYBLADE";
 	}
diff --git a/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs b/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs
index edae79e52..ebd6da42e 100644
--- a/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs
+++ b/wadsrc/static/zscript/actors/doom/id24/id24incinerator.zs
@@ -22,7 +22,7 @@ class ID24Incinerator : DoomWeapon // Incinerator
 	{
 		Weapon.SelectionOrder 120;
 		Weapon.AmmoUse 1;
-		Weapon.AmmoGive 40;
+		Weapon.AmmoGive 20;
 		Weapon.AmmoType "ID24Fuel";
 		Inventory.PickupMessage "$ID24_GOTINCINERATOR";
 		Tag "$TAG_ID24INCINERATOR";