fix flag counter references to new counters