Working through some bugs preventing plugins from loading in XDM.