Corrected Sonar violations