Fix bugs on streamer

Fix bugs on streamer