Minor streaming bugfixes and additions.