Fixes to stream gobbling.