Couple of HTTP client fixes