Fixed some statistics calculators