64-bit: more pointer to int fixes