more fixes to streams