Tweaks to comment count