Fix discovery a little.