Fix some sonar/checkstyle issues