diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index d3eb06de..4fd4d08f 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -253,6 +253,8 @@ startup_common(clixon_handle       h,
             goto done;
         if (xmldb_dump(h, stdout, xt, WITHDEFAULTS_REPORT_ALL) < 0)
             goto done;
+        if (xt)
+            xml_free(xt);
         exit(0);  /* This is fairly abrupt , but need to avoid side-effects of rewinding
                      stack. Alternative is to make a separate function stack for this. */
     }
diff --git a/apps/backend/backend_startup.c b/apps/backend/backend_startup.c
index 321ad7b1..b1ead1ba 100644
--- a/apps/backend/backend_startup.c
+++ b/apps/backend/backend_startup.c
@@ -93,6 +93,8 @@ db_merge(clixon_handle h,
     /* Merge xml into db2. Without commit */
     retval = xmldb_put(h, (char*)db2, OP_MERGE, xt, clicon_username_get(h), cbret);
  done:
+    if (xt)
+        xml_free(xt);
     return retval;
 }
 
@@ -278,9 +280,9 @@ tmp     |-------+-----+-----+
              reset   extrafile
  */
 int
-startup_extraxml(clixon_handle        h,
-                 char                *file,
-                 cbuf                *cbret)
+startup_extraxml(clixon_handle h,
+                 char         *file,
+                 cbuf         *cbret)
 {
     int         retval = -1;
     char       *tmp_db = "tmp";
@@ -334,6 +336,8 @@ startup_extraxml(clixon_handle        h,
  ok:
     retval = 1;
  done:
+    if (xt)
+        xml_free(xt);
     if (xt0)
         xml_free(xt0);
     if (xmldb_delete(h, tmp_db) != 0 && errno != ENOENT)
diff --git a/test/lib.sh b/test/lib.sh
index 92a33ee7..7e68a5c7 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -598,6 +598,7 @@ function wait_backend(){
             err "backend timeout $DEMWAIT seconds"
         fi
     done
+    stty $STTYSETTINGS >/dev/null
 }
 
 # Start restconf daemon