Fixed some more PMD stuff