Fix some issues in display comments