Fixed issues with httpclient