Improved handling of proxies and locations specified on networks.