fix some more PMD