Rep 1039 sonar fixes

Quick sonar fixes round 1