64-bit int fixes