Fix: Various bugs in PP additional.