Minor fix and fav