More x86 Fixes