PMD and POM fixes.