Fixes to controls