Fixes to handle infinite streams
Fixes review feedback