Fixes for pipelineINject