more pf fixes