Discovery fixes