More improvements to address PMD flags.