Fix some PMD errors.