diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 3dde30a6f..df545f18f 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -111,7 +111,9 @@ backend_terminate(clicon_handle h)
     stream_publish_exit();
     clixon_plugin_exit(h);
     /* Delete all backend plugin RPC callbacks */
-    rpc_callback_delete_all(); 
+    rpc_callback_delete_all();
+    /* Delete all backend plugin upgrade callbacks */
+    upgrade_callback_delete_all(); 
 
     if (pidfile)
 	unlink(pidfile);   
diff --git a/apps/backend/backend_startup.c b/apps/backend/backend_startup.c
index 5fc9932af..07f7ed6a1 100644
--- a/apps/backend/backend_startup.c
+++ b/apps/backend/backend_startup.c
@@ -270,6 +270,8 @@ startup_extraxml(clicon_handle        h,
 	goto fail;
     retval = 1;
  done:
+    if (xt)
+	xml_free(xt);
     if (xmldb_delete(h, "tmp") != 0 && errno != ENOENT) 
 	return -1;
     return retval;
diff --git a/test/test_order.sh b/test/test_order.sh
index 07275b428..05f564ae3 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -36,7 +36,6 @@ cat <<EOF > $cfg
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_DIR>/usr/local/lib/example/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
-  <CLICON_CLI_GENMODEL_COMPLETION>1</CLICON_CLI_GENMODEL_COMPLETION>
   <CLICON_XMLDB_DIR>$dbdir</CLICON_XMLDB_DIR>
   <CLICON_XMLDB_PLUGIN>/usr/local/lib/xmldb/text.so</CLICON_XMLDB_PLUGIN>
 </clixon-config>