More PM-related bugfixes

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

More PM-related bugfixes