Small fixes to the streaming stuff.