Minor changes to the Stream API

Change-Id: I26642a867d284b1babdd0dea0d99191c7a5c78fa