Upgrade to cpuid 3 + Fix warnings