Few changes to sonar updates