minor fixes for sonar