Fixes for running PMD and FingBugs.