more pmd issue fixes