Fixed int64_t errors