SONAR-4675 fix some quality flaws