Fix a pair of bugs in the pipeline.