[PATCH] CPUID bug and inconsistency fix