Faraday patches

I ran into a few issues while writing an adapter for Faraday.

Please check out the commit messages for a somewhat more detailed explanation.