more fixes related to ammo upgrade