Minor fix and features