Public controller fixes