Fix up TDL for keyserver / key