SONAR fixes