support adding servers via SID and potentially fix the Server#destroy bug