Tweaks for NIST config