Correct some sonar bugs.