SONAR-3387 Fix quality flaws