diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index f39786da2c69449db91b037370d9a2ec9c8e7c71..895cf23cf864cdd9de998ff4c6bce1e967d0538b 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -622,7 +622,7 @@ typedef struct {
 
   char repStrategy;
   char loadLatest;  // load into mem or not
-  char precision;   // time resoluation
+  uint8_t precision;   // time resolution
 
   char reserved[16];
 } SVnodeCfg, SCreateDbMsg, SDbCfg, SAlterDbMsg;
diff --git a/src/system/detail/inc/mgmtUtil.h b/src/system/detail/inc/mgmtUtil.h
index 04bacbe1dbecff10f780bbeee7d01b58076e0ba5..1f70485894e7e245193b9e432b9e40b126cdb1e6 100644
--- a/src/system/detail/inc/mgmtUtil.h
+++ b/src/system/detail/inc/mgmtUtil.h
@@ -37,6 +37,6 @@ int32_t mgmtRetrieveMetersFromMetric(SMetricMetaMsg* pInfo, int32_t tableIndex,
 int32_t mgmtDoJoin(SMetricMetaMsg* pMetricMetaMsg, tQueryResultset* pRes);
 void mgmtReorganizeMetersInMetricMeta(SMetricMetaMsg* pInfo, int32_t index, tQueryResultset* pRes);
 
-bool tSkipListNodeFilterCallback(struct tSkipListNode *pNode, void *param);
+bool tSkipListNodeFilterCallback(const void *pNode, void *param);
 
 #endif //TBASE_MGMTUTIL_H
diff --git a/src/system/detail/src/mgmtSupertableQuery.c b/src/system/detail/src/mgmtSupertableQuery.c
index 4dc7760d897145d5f1af202b79ff84720ab4f3b8..9b3953227681bc109152b1f94aee0bfa260f51ce 100644
--- a/src/system/detail/src/mgmtSupertableQuery.c
+++ b/src/system/detail/src/mgmtSupertableQuery.c
@@ -203,7 +203,7 @@ static bool mgmtTablenameFilterCallback(tSkipListNode* pNode, void* param) {
 
 static void mgmtRetrieveFromLikeOptr(tQueryResultset* pRes, const char* str, STabObj* pMetric) {
   SPatternCompareInfo       info = PATTERN_COMPARE_INFO_INITIALIZER;
-  SMeterNameFilterSupporter supporter = {info, str};
+  SMeterNameFilterSupporter supporter = {info, (char*) str};
 
   pRes->num =
       tSkipListIterateList(pMetric->pSkipList, (tSkipListNode***)&pRes->pRes, mgmtTablenameFilterCallback, &supporter);
@@ -230,7 +230,7 @@ static void mgmtFilterByTableNameCond(tQueryResultset* pRes, char* condStr, int3
   free(str);
 }
 
-static bool mgmtJoinFilterCallback(tSkipListNode* pNode, void* param) {
+UNUSED_FUNC static bool mgmtJoinFilterCallback(tSkipListNode* pNode, void* param) {
   SJoinSupporter* pSupporter = (SJoinSupporter*)param;
 
   SSchema s = {0};
@@ -639,7 +639,8 @@ static void getTagColumnInfo(SSyntaxTreeFilterSupporter* pSupporter, SSchema* pS
   }
 }
 
-void filterPrepare(tSQLBinaryExpr* pExpr, void* param) {
+void filterPrepare(void* expr, void* param) {
+  tSQLBinaryExpr *pExpr = (tSQLBinaryExpr*) expr;
   if (pExpr->info != NULL) {
     return;
   }
@@ -791,9 +792,10 @@ static char* getTagValueFromMeter(STabObj* pMeter, int32_t offset, void* param)
   }
 }
 
-bool tSkipListNodeFilterCallback(tSkipListNode* pNode, void* param) {
+bool tSkipListNodeFilterCallback(const void* pNode, void* param) {
+  
   tQueryInfo* pInfo = (tQueryInfo*)param;
-  STabObj*    pMeter = (STabObj*)pNode->pData;
+  STabObj*    pMeter = (STabObj*)(((tSkipListNode*)pNode)->pData);
 
   char   name[TSDB_METER_NAME_LEN + 1] = {0};
   char*  val = getTagValueFromMeter(pMeter, pInfo->offset, name);
diff --git a/src/system/detail/src/vnodeShell.c b/src/system/detail/src/vnodeShell.c
index 5eea6632afaa37b7a07ea28402cb758fe08b521d..9ae33c43b72a34643e8b22c5c14174af34e80bfb 100644
--- a/src/system/detail/src/vnodeShell.c
+++ b/src/system/detail/src/vnodeShell.c
@@ -473,7 +473,7 @@ void vnodeExecuteRetrieveReq(SSchedMsg *pSched) {
 
   if (numOfRows == 0 && (pRetrieve->qhandle == (uint64_t)pObj->qhandle) && (code != TSDB_CODE_ACTION_IN_PROGRESS)) {
     dTrace("QInfo:%p %s free qhandle code:%d", pObj->qhandle, __FUNCTION__, code);
-    vnodeFreeQInfo(pObj->qhandle);
+    vnodeFreeQInfo(pObj->qhandle, true);
     pObj->qhandle = NULL;
   }