XLink fixes for 210x