Small stream fixes