Fixed overflow by making nextRun_ uint64_t and other minor cleanup