Improvements to satisfy sonar.