Core: Logical fixes and improvements in EventMap
Core: Fix check in EventMap::IsInPhase