Main controller fixes