Complete Q8
Correct two bugs about streaming...