Minor changes for CFXE