Merge "Fix X86 flags"