Fixed some bugs in the Streaming controller