Fix Sonar comments.