improved support for 32-bit builds