Small fixes in discovery service