Streaming fixes