[Stream] Fix some returns