Fix problems reported by PMD