Fix commented bugs