Stream fixes