Fixing some issues in EventManager