Minor fix and change