handled a few sonar issues