Fixes to control menu.