Latest round of x86 fixes