Fix counters and gauges