Fixes after Pipelet.._output refactoring