32-bit x86 fix and more