Missing streams bugfix #2172 and #2178

Minor edits to attempt to fix bugs #2172 and #2178.