Fixes to the pipeline