More post-processing work + pipe untargeting