Fix inlining into flows again
Tweak pipeline