Http client fixes