REST fixes