Event scope fixes