Finished fixing XCMP