Minor fix and updates