Various Sonar fixes