Fix some counter issues