32-bit bugfixes