more sonar fixes