Apply modifications for Sonar