Revert "Revert "upgrade some int to int64_t to avoid overflows in reporting"" This reverts commit d3b358dede30fc16099bff53c5ee33228bcd53c1.