More XT Server changes