Fix bugs in Rest Client

No match.