Fix some more pmd errors