various sonar bugfixes