! Fix several PM label bugs

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1359 from Oldiesmann/release-2.1

! Fix several PM label bugs