More control file tweaks.