I did some sonar fixes