Fixed some pmd issues.