32-bit fixups