EventManager Runtime Fixes