pmd-fixes