GearSwap and Slips fixes