Minor PP additions
Merge branch 'master' into RefScript