Small fixes to the REST client discovered during unit tests composition.