Bumped the event channel up to support more flags being set.
Merge branch 'race_fix'