Final fixes for new comments