Comments feature fixes