Fix Sonar integration