Fix bugs in EventStream.