Fix comment handling