Core Logical fixes and improvements in EventMaps.