Fix count updates