findbugs/PMD fix