more stream fixes