Fix up the js and streaming bugs