Fix some bugs in comment_notifications