Fix scope event signatures