Minor fixes to counter