Fix some small issues pointed by Sonar

No match.