small sonar fixes