High-level streaming fixes.