SONAR-5389 Fix some quality flaws