Add some fixes for http_proxy support.