A few PMD fixes