SONAR-3893 fix some quality flaws