minor fixes for new stream