More fixes to controls