[Stream] Fix some returns

This PR fixes some stream returns.