Making UDP discovery more robust