Tweaks to EnoughDCF