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

Signed-off-by: Peter Spicer <sleeping@myperch.org>