Final fixes to ProxyDiscoverer, now works.