Minor fix in unread messages
More fixes