* Fix cluster/datacenter discovery