XTServer improvements