Fixed streaming bugs for 0.8 - this should close #25