more tweaks for PM stuff