More findbugs and PMD fixes