Make all the XEP-related commits work together