Sonar fixes to provided files