Fixes to control