Streaming fixes.