Fix up kadmin_server stuff