More fixes for better use of proxies