Minor fixes to streamer.