Assorted fixes (tracking the stream status etc)