More counters fixed