some sonar problems fixed