Fixup after @decorator move
Stream utilities