REST controller fixes