Minor fix and update