EventManager Fixes