Various weapon/equip fixes