Fixes to streamer