Mark as read fixes