Update to use standard int64_t