Make the discovery work (more-or-less)