More PMD fixes.