Fix stats to be per thread