Parser upd & StreamChannel fix