Updates for problems reported by PMD