Small CF tweaks.