HTTPClient: few changes