Fixes to pipeline.