Multiple major fixes in pipeline wrapper