Reduce major Sonar bugs