Further tweaks to improve discovery