More sonar exclude tweaking