Fixed some counter bugs