More fixes to counter