Fixing all bugs for weapon bonuses