Fix a few 32-bit-only issues