Minor fix and changes...