Some streaming fixes