Fix: bugs with EdgeTEdgeCommonProps