Update references for XControls