More foolproofing of the CPU configuration.