SONAR-5758 fix quality flaws