Last minute changes for XtextCON