Updated sonar fixes