XT Server improvements