Minor fixes in Streams