Minor tweak in discovery process to play nicer with Cw Skimmer / Skimsrv