PMD fixes