Bug Fixes for RestClient