More stream fixes.