diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index f0c2f824..cd034bf2 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -569,7 +569,7 @@ main(int    argc,
             help = 1; 
             break;
         case 'V':
-            cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING);
+            cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
             print_version++; /* plugins may also print versions w ca-version callback */
             break;
         case 'D' : { /* debug */
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index 543f5bc4..69380f43 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -580,7 +580,7 @@ main(int    argc,
             help = 1;
             break;
         case 'V': /* version */
-            cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING);
+            cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
             print_version++; /* plugins may also print versions w ca-version callback */
             break;
         case 'D' : { /* debug */
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index d617c1b2..c85a586c 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -709,7 +709,7 @@ main(int    argc,
             usage(h, argv[0]);
             break;
         case 'V': /* version */
-            cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING);
+            cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
             print_version++; /* plugins may also print versions w ca-version callback */
             break;
         case 'D' : { /* debug */
diff --git a/apps/restconf/restconf_lib.c b/apps/restconf/restconf_lib.c
index c8ad5fe4..f19582bb 100644
--- a/apps/restconf/restconf_lib.c
+++ b/apps/restconf/restconf_lib.c
@@ -376,9 +376,9 @@ restconf_terminate(clixon_handle h)
     if ((x = clicon_conf_xml(h)) != NULL)
         xml_free(x);
     xpath_optimize_exit();
-    restconf_handle_exit(h);
     clixon_err_exit();
     clixon_debug(CLIXON_DBG_RESTCONF, "pid:%u done", getpid());
+    restconf_handle_exit(h);
     clixon_log_exit(); /* Must be after last clixon_debug */
     return 0;
 }
diff --git a/apps/restconf/restconf_main_fcgi.c b/apps/restconf/restconf_main_fcgi.c
index e7e69b40..5f47629e 100644
--- a/apps/restconf/restconf_main_fcgi.c
+++ b/apps/restconf/restconf_main_fcgi.c
@@ -345,7 +345,7 @@ main(int    argc,
             usage(h, argv[0]);
             break;
         case 'V':
-            cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING);
+            cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
             print_version++; /* plugins may also print versions w ca-version callback */
             break;
         case 'D' : { /* debug */
diff --git a/apps/restconf/restconf_main_native.c b/apps/restconf/restconf_main_native.c
index 01c29ebf..9c7d1b6f 100644
--- a/apps/restconf/restconf_main_native.c
+++ b/apps/restconf/restconf_main_native.c
@@ -1168,7 +1168,7 @@ main(int    argc,
             usage(h, argv0);
             break;
         case 'V': /* version */
-            cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING);
+            cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
             print_version++; /* plugins may also print versions w ca-version callback */
             break;
         case 'D' : { /* debug. Note this overrides any setting in the config */
diff --git a/apps/snmp/snmp_main.c b/apps/snmp/snmp_main.c
index 431ecae2..b9d7ff69 100644
--- a/apps/snmp/snmp_main.c
+++ b/apps/snmp/snmp_main.c
@@ -381,7 +381,7 @@ main(int    argc,
             usage(h, argv[0]);
             break;
         case 'V': /* version */
-            cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING);
+            cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
             exit(0);
             break;
         case 'D' : { /* debug */
diff --git a/lib/clixon/clixon_plugin.h b/lib/clixon/clixon_plugin.h
index 8730cf54..88207369 100644
--- a/lib/clixon/clixon_plugin.h
+++ b/lib/clixon/clixon_plugin.h
@@ -340,7 +340,7 @@ typedef int (errmsg_t)(clixon_handle h, const char *fn, const int line,
  *
  * A plugin can customize a version (or banner) output on stdout.
  * Several version strings can be printed if there are multiple callbacks.
- * If not regstered plugins exist, clixon prints CLIXON_VERSION_STRING
+ * If not registered plugins exist, clixon prints CLIXON_VERSION_STRING
  * Typically invoked by command-line option -V
  * @param[in]  h   Clixon handle
  * @param[in]  f   Output file
diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c
index 06ff9857..376449be 100644
--- a/lib/src/clixon_xml.c
+++ b/lib/src/clixon_xml.c
@@ -1588,7 +1588,6 @@ xml_rm_children(cxobj          *xp,
     return retval;
 }
 
-
 /*! Remove top XML object and all children except a single child
  *
  * Given a root xml node, and the i:th child, remove the child from its parent
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 694b5d3f..b685c5ba 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -408,6 +408,8 @@ xml_diff1(cxobj     *x0,
     for (;;){
         if (x0c == NULL && x1c == NULL)
             goto ok;
+        y0c = NULL;
+        y1c = NULL;
         /* If cl:ignore-compare extension, return equal */
         if (x0c && (y0c = xml_spec(x0c)) != NULL){
             if (yang_extension_value(y0c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)
diff --git a/test/test_cli.sh b/test/test_cli.sh
index 103a79c9..58ebe399 100755
--- a/test/test_cli.sh
+++ b/test/test_cli.sh
@@ -177,7 +177,7 @@ new "wait backend"
 wait_backend
     
 new "cli version"
-expectpart "$($clixon_cli -1 -f $cfg -V)" 0 "Clixon version $CLIXON_VERSION" "Clixon main example version"
+expectpart "$($clixon_cli -1 -f $cfg -V)" 0 "Clixon version: $CLIXON_VERSION" "Clixon main example version"
 
 new "cli configure top"
 expectpart "$($clixon_cli -1 -f $cfg set interfaces)" 0 "^$"