Several Sonar fixes