Fixed some more uint64_t occurrences