stream fixes