Fix remaining add_comment() calls