Corrected SONAR issues