Fix some counter stuff