Small fixes
Swap controls