Fixed comment counts