DF Fixed some sonar bugs.