Fix some pmd issues.