SyncBasedDiscovery: bug fixes