Fixes to the streaming framework to make it compile and to allow the demo app to run.