Fixes and updates to output pipeline