VTServer improvements