PMD analysis fixes.