Fix bugs in Rest Client