Fixes for rest-client ~> 1.7