fixes for the stream graph compatibility as well as fixes for demo