Updated control file with known conflicting tweaks