Sonar fixes
Fix PR #235