Corrections for Sonar violations