Changes to accomodate new Faraday version.