Fix comments, favorites