some more pmd fix..