diff --git a/apps/restconf/restconf_lib.c b/apps/restconf/restconf_lib.c
index def64fe2..1b5ef4ce 100644
--- a/apps/restconf/restconf_lib.c
+++ b/apps/restconf/restconf_lib.c
@@ -606,7 +606,7 @@ restconf_config_init(clicon_handle h,
     cxobj *x;
     char  *bstr;
     cvec  *nsc = NULL;
-    clixon_auth_type_t auth_type;
+    int    auth_type;
 	 
     if ((x = xpath_first(xrestconf, nsc, "enable")) != NULL &&
 	(enable = xml_body(x)) != NULL){
diff --git a/apps/restconf/restconf_main_evhtp.c b/apps/restconf/restconf_main_evhtp.c
index 3c2ca75e..be91ebae 100644
--- a/apps/restconf/restconf_main_evhtp.c
+++ b/apps/restconf/restconf_main_evhtp.c
@@ -821,7 +821,7 @@ restconf_connection(int   s,
 {
     int                 retval = -1;
     evhtp_connection_t *conn = NULL;
-    size_t              n;
+    ssize_t             n;
     char                buf[1024];
     SSL                *ssl;
     clicon_handle       h;
@@ -864,7 +864,7 @@ restconf_connection(int   s,
 	clicon_debug(1, "%s connection_parse error", __FUNCTION__);
 	if (accept_badrequest(h, s, conn->ssl) < 0)
 	    goto done;
-	SSL_free(ssl);
+	SSL_free(conn->ssl);
 	if (close_openssl_socket(s, NULL) < 0)
 	    goto done;
 	conn->ssl = NULL;
@@ -1085,7 +1085,9 @@ restconf_accept_client(int   fd,
 	    case SSL_ERROR_WANT_X509_LOOKUP:     /* 4 */
 	    case SSL_ERROR_WANT_ASYNC:           /* 8 */
 	    case SSL_ERROR_WANT_ASYNC_JOB:       /* 10 */
+#ifdef SSL_ERROR_WANT_CLIENT_HELLO_CB
 	    case SSL_ERROR_WANT_CLIENT_HELLO_CB: /* 11 */
+#endif
 		break;
 	    }
 	    clicon_err(OE_SSL, 0, "SSL_accept:%d", e);
diff --git a/lib/src/clixon_xml_io.c b/lib/src/clixon_xml_io.c
index f383bd43..7b2e1a2f 100644
--- a/lib/src/clixon_xml_io.c
+++ b/lib/src/clixon_xml_io.c
@@ -554,19 +554,6 @@ _xml_parse(const char *str,
     goto done;
 }
 
-/*! FSM to detect substring
- */
-static inline int
-FSM(char *tag, 
-    char  ch, 
-    int   state)
-{
-    if (tag[state] == ch)
-	return state+1;
-    else
-	return 0;
-}
-
 /*! Read an XML definition from file and parse it into a parse-tree, advanced API
  *
  * @param[in]     fd    A file descriptor containing the XML file (as ASCII characters)
diff --git a/test/cicd/cicd.sh b/test/cicd/cicd.sh
index 61b7cade..f8d4587f 100755
--- a/test/cicd/cicd.sh
+++ b/test/cicd/cicd.sh
@@ -42,6 +42,12 @@ ssh -t $h "test -d src/cligen || (cd src;git clone https://github.com/clicon/cli
 ssh -t $h "(cd src/cligen;git pull origin master)"
 ssh -t $h "(cd src/cligen;./configure)"
 ssh -t $h "(cd src/cligen; /tmp/cligen-mk.sh)"
+# pull git changes and build clixon-libevhtp
+ssh -t $h "test -d src || mkdir src"
+ssh -t $h "test -d src/clixon-libevhtp || (cd src;git clone https://github.com/clicon/clixon-libevhtp.git)"
+ssh -t $h "(cd src/clixon-libevhtp;git pull origin master)"
+ssh -t $h "(cd src/clixon-libevhtp;./configure)"
+ssh -t $h "(cd src/clixon-libevhtp; /tmp/cligen-mk.sh)" # re-use cligen
 # pull git changes and build clixon
 ssh -t $h "test -d src/clixon || (cd src;git clone https://github.com/clicon/clixon.git)"
 ssh -t $h "(cd src/clixon;git pull origin master)"