SONARERLNG-15 Fix quality flaws