diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 6b5af3f9ef68705e55b6200adb6dd6b3f806aecb..acd6c6ccce220479ce5778344edea4fbf85ea93f 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -247,9 +247,9 @@ vercomp () {
 
 function is_version_compatible() {
 
-    curr_version=$(${bin_dir}/taosd -V | cut -d ' ' -f 1)
+    curr_version=$(${bin_dir}/taosd -V | cut -d ' ' -f 2)
 
-    min_compatible_version=$(${script_dir}/bin/taosd -V | cut -d ' ' -f 2)
+    min_compatible_version=$(${script_dir}/bin/taosd -V | cut -d ' ' -f 4)
 
     vercomp $curr_version $min_compatible_version
     case $? in
diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index d61621f9db406df103aa39ae2451f94a84b46414..a19579b7d4f0a7eed9b06ea45924a38f989fead5 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -206,10 +206,10 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_connectImp(JNIEn
 
   ret = (jlong)taos_connect((char *)host, (char *)user, (char *)pass, (char *)dbname, jport);
   if (ret == 0) {
-    jniError("jobj:%p, taos:%p, connect to tdengine failed, host=%s, user=%s, dbname=%s, port=%d", jobj, (void *)ret,
+    jniError("jobj:%p, conn:%p, connect to database failed, host=%s, user=%s, dbname=%s, port=%d", jobj, (void *)ret,
              (char *)host, (char *)user, (char *)dbname, jport);
   } else {
-    jniTrace("jobj:%p, taos:%p, connect to tdengine succeed, host=%s, user=%s, dbname=%s, port=%d", jobj, (void *)ret,
+    jniTrace("jobj:%p, conn:%p, connect to database succeed, host=%s, user=%s, dbname=%s, port=%d", jobj, (void *)ret,
              (char *)host, (char *)user, (char *)dbname, jport);
   }
 
@@ -230,7 +230,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
   }
 
   if (jsql == NULL) {
-    jniError("jobj:%p, taos:%p, sql is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, sql is null", jobj, tscon);
     return JNI_SQL_NULL;
   }
 
@@ -248,7 +248,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
 
   int code = taos_query(tscon, dst);
   if (code != 0) {
-    jniError("jobj:%p, taos:%p, code:%d, msg:%s, sql:%s", jobj, tscon, code, taos_errstr(tscon), dst);
+    jniError("jobj:%p, conn:%p, code:%d, msg:%s, sql:%s", jobj, tscon, code, taos_errstr(tscon), dst);
     free(dst);
     return JNI_TDENGINE_ERROR;
   } else {
@@ -257,9 +257,9 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
 
     if (pSql->cmd.command == TSDB_SQL_INSERT) {
       affectRows = taos_affected_rows(tscon);
-      jniTrace("jobj:%p, taos:%p, code:%d, affect rows:%d, sql:%s", jobj, tscon, code, affectRows, dst);
+      jniTrace("jobj:%p, conn:%p, code:%d, affect rows:%d, sql:%s", jobj, tscon, code, affectRows, dst);
     } else {
-      jniTrace("jobj:%p, taos:%p, code:%d, sql:%s", jobj, tscon, code, dst);
+      jniTrace("jobj:%p, conn:%p, code:%d, sql:%s", jobj, tscon, code, dst);
     }
 
     free(dst);
@@ -293,10 +293,10 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(
 
   if (tscIsUpdateQuery(tscon)) {
     ret = 0;  // for update query, no result pointer
-    jniTrace("jobj:%p, taos:%p, no result", jobj, tscon);
+    jniTrace("jobj:%p, conn:%p, no result", jobj, tscon);
   } else {
     ret = (jlong) taos_use_result(tscon);
-    jniTrace("jobj:%p, taos:%p, get resultset:%p", jobj, tscon, (void *) ret);
+    jniTrace("jobj:%p, conn:%p, get resultset:%p", jobj, tscon, (void *) ret);
   }
 
   return ret;
@@ -311,12 +311,12 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(
   }
 
   if ((void *)res == NULL) {
-    jniError("jobj:%p, taos:%p, resultset is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
     return JNI_RESULT_SET_NULL;
   }
 
   taos_free_result((void *)res);
-  jniTrace("jobj:%p, taos:%p, free resultset:%p", jobj, tscon, (void *)res);
+  jniTrace("jobj:%p, conn:%p, free resultset:%p", jobj, tscon, (void *)res);
   return JNI_SUCCESS;
 }
 
@@ -330,7 +330,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getAffectedRowsIm
 
   jint ret = taos_affected_rows(tscon);
 
-  jniTrace("jobj:%p, taos:%p, affect rows:%d", jobj, tscon, (void *)con, ret);
+  jniTrace("jobj:%p, conn:%p, affect rows:%d", jobj, tscon, (void *)con, ret);
 
   return ret;
 }
@@ -346,7 +346,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getSchemaMetaData
 
   TAOS_RES *result = (TAOS_RES *)res;
   if (result == NULL) {
-    jniError("jobj:%p, taos:%p, resultset is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
     return JNI_RESULT_SET_NULL;
   }
 
@@ -356,10 +356,10 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getSchemaMetaData
   // jobject arrayListObj = (*env)->NewObject(env, g_arrayListClass, g_arrayListConstructFp, "");
 
   if (num_fields == 0) {
-    jniError("jobj:%p, taos:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
+    jniError("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
     return JNI_NUM_OF_FIELDS_0;
   } else {
-    jniTrace("jobj:%p, taos:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
+    jniTrace("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
     for (int i = 0; i < num_fields; ++i) {
       jobject metadataObj = (*env)->NewObject(env, g_metadataClass, g_metadataConstructFp);
       (*env)->SetIntField(env, metadataObj, g_metadataColtypeField, fields[i].type);
@@ -402,7 +402,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
 
   TAOS_RES *result = (TAOS_RES *)res;
   if (result == NULL) {
-    jniError("jobj:%p, taos:%p, resultset is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
     return JNI_RESULT_SET_NULL;
   }
 
@@ -410,7 +410,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
   int         num_fields = taos_num_fields(result);
 
   if (num_fields == 0) {
-    jniError("jobj:%p, taos:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
+    jniError("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, res, num_fields);
     return JNI_NUM_OF_FIELDS_0;
   }
 
@@ -418,10 +418,10 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
   if (row == NULL) {
     int tserrno = taos_errno(tscon);
     if (tserrno == 0) {
-      jniTrace("jobj:%p, taos:%p, resultset:%p, fields size is %d, fetch row to the end", jobj, tscon, res, num_fields);
+      jniTrace("jobj:%p, conn:%p, resultset:%p, fields size is %d, fetch row to the end", jobj, tscon, res, num_fields);
       return JNI_FETCH_END;
     } else {
-      jniTrace("jobj:%p, taos:%p, interruptted query", jobj, tscon);
+      jniTrace("jobj:%p, conn:%p, interruptted query", jobj, tscon);
       return JNI_RESULT_SET_NULL;
     }
   }
@@ -485,7 +485,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_closeConnectionIm
     jniError("jobj:%p, connection is closed", jobj);
     return JNI_CONNECTION_NULL;
   } else {
-    jniTrace("jobj:%p, taos:%p, close connection success", jobj, tscon);
+    jniTrace("jobj:%p, conn:%p, close connection success", jobj, tscon);
     taos_close(tscon);
     return JNI_SUCCESS;
   }
@@ -640,7 +640,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_validateCreateTab
   }
 
   if (jsql == NULL) {
-    jniError("jobj:%p, taos:%p, sql is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, sql is null", jobj, tscon);
     return JNI_SQL_NULL;
   }
 
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 49368e4d177b200e37af1f0572d24b1f3fba60f3..aa80e505d5f4938a746f8ce4c255fa6f2df7426a 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -562,7 +562,7 @@ void *tscProcessMsgFromServer(char *msg, void *ahandle, void *thandle) {
       void *taosres = tscKeepConn[command] ? pSql : NULL;
       code = pRes->code ? -pRes->code : pRes->numOfRows;
 
-      tscTrace("%p Async SQL result:%d taosres:%p", pSql, code, taosres);
+      tscTrace("%p Async SQL result:%d res:%p", pSql, code, taosres);
 
       /*
        * Whether to free sqlObj or not should be decided before call the user defined function, since this SqlObj
diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 708ceee4054c2f22dd44d1cf5a5c72a419994eff..5e383c9d0b1159e7b17aa156f46ca92fc915a25f 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -176,7 +176,7 @@ void taos_init_imp() {
   tscConnCache = taosOpenConnCache(tsMaxMeterConnections * 2, taosCloseRpcConn, tscTmr, tsShellActivityTimer * 1000);
 
   initialized = 1;
-  tscTrace("taos client is initialized successfully");
+  tscTrace("client is initialized successfully");
   tsInsertHeadSize = tsRpcHeadSize + sizeof(SShellSubmitMsg);
 }
 
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index df29a72e860904bfbca6defe0b5472d37f8bbc25..f9fe9efa33a3cc6e9073e1acb596bb269afbd90e 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -30,6 +30,9 @@
 #include <wordexp.h>
 
 #include "taos.h"
+
+extern char configDir[];
+
 #pragma GCC diagnostic ignored "-Wmissing-braces"
 
 #define BUFFER_SIZE      65536
diff --git a/src/modules/http/src/httpSystem.c b/src/modules/http/src/httpSystem.c
index 5c0d9a69d60f038a1c37ed48bb0c4a6e27501966..ece7c1781475345724b5b706a91e234263ab8c28 100644
--- a/src/modules/http/src/httpSystem.c
+++ b/src/modules/http/src/httpSystem.c
@@ -50,7 +50,7 @@ int httpInitSystem() {
   httpServer = (HttpServer *)malloc(sizeof(HttpServer));
   memset(httpServer, 0, sizeof(HttpServer));
 
-  strcpy(httpServer->label, "taosh");
+  strcpy(httpServer->label, "rest");
   strcpy(httpServer->serverIp, tsHttpIp);
   httpServer->serverPort = tsHttpPort;
   httpServer->cacheContext = tsHttpCacheSessions;
diff --git a/src/modules/monitor/src/monitorSystem.c b/src/modules/monitor/src/monitorSystem.c
index 013d86050ecc142c7bc9c61b6ff6c5bf9e611ace..78cee40f9655098dcd96e874dd96a5070e1a82fc 100644
--- a/src/modules/monitor/src/monitorSystem.c
+++ b/src/modules/monitor/src/monitorSystem.c
@@ -131,7 +131,7 @@ void monitorInitConn(void *para, void *unused) {
 
 void monitorInitConnCb(void *param, TAOS_RES *result, int code) {
   if (code < 0) {
-    monitorError("monitor:%p, connect to taosd failed, code:%d", monitor->conn, code);
+    monitorError("monitor:%p, connect to database failed, code:%d", monitor->conn, code);
     taos_close(monitor->conn);
     monitor->conn = NULL;
     monitor->state = MONITOR_STATE_UN_INIT;
@@ -139,7 +139,7 @@ void monitorInitConnCb(void *param, TAOS_RES *result, int code) {
     return;
   }
 
-  monitorTrace("monitor:%p, connect to taosd success, code:%d", monitor->conn, code);
+  monitorTrace("monitor:%p, connect to database success, code:%d", monitor->conn, code);
   monitorInitDatabase();
 }
 
diff --git a/tests/examples/JDBC/readme.md b/tests/examples/JDBC/readme.md
index 54a2e5c6ac96b2480d9b1f438d8e11312b09d798..a91624a9e47a3015d88e2e9aa9f62cf8dd0672cc 100644
--- a/tests/examples/JDBC/readme.md
+++ b/tests/examples/JDBC/readme.md
@@ -9,5 +9,5 @@ TDengine's JDBC driver jar is not yet published to maven center repo, so we need
 ## Compile the Demo Code and Run It
 To compile the demo project, go to the source directory ``TDengine/tests/examples/JDBC/JDBCDemo`` and execute
 <pre>mvn clean assembly:single package</pre>
-The ``pom.xml`` is configured to package all the dependencies into one executable jar file. To run it, go to ``TDengine/tests/examples/JDBC/JDBCDemo/target`` and execute
+The ``pom.xml`` is configured to package all the dependencies into one executable jar file. To run it, go to ``examples/JDBC/JDBCDemo/target`` and execute
 <pre>java -jar jdbcdemo-1.0-SNAPSHOT-jar-with-dependencies.jar</pre>