HTTP client fixes