Fix stream management dupe errors
3.1.7