Added sonar fixes