Stabilize the new push path

The new push path seems stable after some fixes. I tested with tst, poc (bc), cc-tst, cc-poc, poc (cc), and all ran well several times.