Fixed some sonar-reported issues.
6 files changed