Fixed discovery errors