more fixes to the pipeline