Core: Logical fixes and improvements in EventMap