x86: Fixups for x32