merge in PoS fixes

Merge in corrections to PoS modifier, isolate old clients.