Improve collector stream handling as well