Fixes to get Example app building with new streaming. Buddy: Jonty