Tweaks to stream