Additional weapon/equip fixes