Adding SONAR fixes for