Minor changes on Xedit