fixes for stream library