Minor fix and improvement