did some sonar fixes