Fixes to control system