Fix p/P compatibility.
Merge branch 'yankstack-comp-fix' into master2