More pmd fixes done.