Some instream fixes
Another instream fix