GearSwap - minor fixes