Fix FindBugs warnings
Fix PMD warnings