Fixes to Ammo