Various upstream fixes
Routed event infrastructure