Fix MXM connection establishment flow