some sonar bugs fixed