GearSwap - Minor fixes