Fix general comments