More PM-related bugfixes

Fixes #532

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>