Fix StepCounter and PeakRateCounter