! A few more bugfixes related to updating PM labels...

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

! A few more bugfixes related to updating PM labels...