Minor fixes + Guzzle wrapper