Fix EventManager issues