First pass to fix Opera regression with streaming
 Clean to make streaming works properly on all browsers
More clean up
backport inError logic
Fix regression