Minor fix from comments