Fix some PMD errors