Shortcuts fixes
Gearswap fixes (again)