Minor fix and TODO