Adding various fixes to the pipeline