some more PMD fixes