Fix pmd issues