add missing pips when pfs enabled and any fixes