Remove some PMD warnings