small fixes to PM