mroe sonar fixes, now done according to latest report

mroe sonar fixes, now done according to latest report