Fixups and changes for x86 emulation fixed up