Initial fixes for Guzzle 4