Some Sonar bugs fixed.