small fixes in discovery service