Switch most of critical counters to use size instead of count