32-bit fixes