Minor fixes to the control interface