Some fixes in discovery and yc