x86 related fixes