Some Sonar bugs fixed.
Some Sonar bugs fixed.