Guzzle 3.9 compatibility fixes