fixes in discovery