Fixes to Weapon