Streaming: important bugfixes