Streaming Demo fixes