More fixes to control