More fixes on comments