Fixes to work with Faraday 0.8.x