Fixes for streaming example