Correct CrossCompPlacer and CrossComponentVariant2