Fixed comment counting and helpers aggregation error.