Properly implement CPU erratum