some sonar fixed