Minor tweaks to stream