some changes for sonar 3.6 api