Core: Logical fixes in EventMap