Fixed some pmd stuff