issue6551: Correct some comments