Some fixes on CommentsRepository