PM fixes
Merge pull request #27 from Kiwi7/master

More fixes due to Kiwi7's fails