Fix even more checkstyle,pmd,findbugs stuff