GearSwap: Fix the fixes