Minor fix and changes