Fix xfields.