Some comment count fixes