Fix multi-stream errors