Fix some more SonarLint findings