XT Server fix
Fix up after merge