pmd fixes and updates