Fix checkstyle/PMD things