Place controller fixes