More "Sonar" cleanups, fixes.