Fix PMD & FindBugs warnings