SONAR-5007 fix some quality flaws