Counter improvements

No match.