More PMD fixes