fix some minor issues for Sonar

No match.