WIP fixes for pipelineInject