Fix a couple of quality issues found via Sonar analysis