Fixed remaining changes post guzzle