More Weapon Fixes