fix some PMD warnings