further pmd fixes