! Fix some immediate bugs in PMs. Plenty more still broken.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1347 from Arantor/release-2.1

! Fix some immediate bugs in PMs. Plenty more still broken.