some sonar fixes
Merge pull request #463 from baev/sonar-fixes

Some sonar fixes