Fixed some sonar problems.