Some controller fixes