Fixes to the top level controller