Changes to work with SonarQube 3.7 and above