32-bit build fixes