streams fixes