Fixing some PMD regressions
5 files changed