Battlemod and gearswap fix