Resolved remaning sonar issues.