More "sonar" fixes, now less than 30% of original results.