#pmd fixes