REST-client fixes