Fix stream events