diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 9f6ccef50d4310fc0fed2d0a3243d2c0797e1740..d1dc18605f5dd735a0a48d62bbf3b53aef4ee6e3 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -243,7 +243,7 @@ int tscSendMsgToServer(SSqlObj *pSql) {
   STscObj* pObj = pSql->pTscObj;
   SSqlCmd* pCmd = &pSql->cmd;
   
-  char *pMsg = rpcMallocCont(sizeof(SMsgVersion) + pCmd->payloadLen);
+  char *pMsg = rpcMallocCont(pCmd->payloadLen);
   if (NULL == pMsg) {
     tscError("%p msg:%s malloc failed", pSql, taosMsg[pSql->cmd.msgType]);
     return TSDB_CODE_TSC_OUT_OF_MEMORY;
@@ -254,13 +254,12 @@ int tscSendMsgToServer(SSqlObj *pSql) {
     tscDumpMgmtEpSet(pSql);
   }
 
-  tstrncpy(pMsg, version, sizeof(SMsgVersion));
-  memcpy(pMsg + sizeof(SMsgVersion), pSql->cmd.payload, pSql->cmd.payloadLen);
+  memcpy(pMsg, pSql->cmd.payload, pSql->cmd.payloadLen);
 
   SRpcMsg rpcMsg = {
       .msgType = pSql->cmd.msgType,
       .pCont   = pMsg,
-      .contLen = pSql->cmd.payloadLen + sizeof(SMsgVersion),
+      .contLen = pSql->cmd.payloadLen,
       .ahandle = (void*)pSql->self,
       .handle  = NULL,
       .code    = 0
diff --git a/src/dnode/src/dnodeMRead.c b/src/dnode/src/dnodeMRead.c
index b32326f4c2362e7a30489277b62e3e33738c2f3a..0fc6400d99f8dbcbc57caa2ed1265e36e18f1a93 100644
--- a/src/dnode/src/dnodeMRead.c
+++ b/src/dnode/src/dnodeMRead.c
@@ -124,6 +124,8 @@ void dnodeDispatchToMReadQueue(SRpcMsg *pMsg) {
     SMnodeMsg *pRead = mnodeCreateMsg(pMsg);
     taosWriteQitem(tsMReadQueue, TAOS_QTYPE_RPC, pRead);
   }
+
+  rpcFreeCont(pMsg->pCont);
 }
 
 static void dnodeFreeMReadMsg(SMnodeMsg *pRead) {
diff --git a/src/dnode/src/dnodeMWrite.c b/src/dnode/src/dnodeMWrite.c
index 9007b54d47172da500f5af373daebed9ae3e66b8..414b66653d123b785643cfdc96b429edbe8d58ad 100644
--- a/src/dnode/src/dnodeMWrite.c
+++ b/src/dnode/src/dnodeMWrite.c
@@ -125,6 +125,8 @@ void dnodeDispatchToMWriteQueue(SRpcMsg *pMsg) {
            taosMsg[pWrite->rpcMsg.msgType], tsMWriteQueue);
     taosWriteQitem(tsMWriteQueue, TAOS_QTYPE_RPC, pWrite);
   }
+
+  rpcFreeCont(pMsg->pCont);
 }
 
 static void dnodeFreeMWriteMsg(SMnodeMsg *pWrite) {
diff --git a/src/dnode/src/dnodeShell.c b/src/dnode/src/dnodeShell.c
index 221e13d109576f9c4a46ae689ebddaf96e11d28d..79cc70005b6e83bc1c455abb7cd3709ae29a8643 100644
--- a/src/dnode/src/dnodeShell.c
+++ b/src/dnode/src/dnodeShell.c
@@ -127,20 +127,7 @@ static void dnodeProcessMsgFromShell(SRpcMsg *pMsg, SRpcEpSet *pEpSet) {
   } else {}
 
   if ( dnodeProcessShellMsgFp[pMsg->msgType] ) {
-    SMsgVersion *pMsgVersion = pMsg->pCont;
-    if (taosCheckVersion(pMsgVersion->clientVersion, version, 3) != TSDB_CODE_SUCCESS) {
-      rpcMsg.code = TSDB_CODE_TSC_INVALID_VERSION;
-      rpcSendResponse(&rpcMsg);
-      rpcFreeCont(pMsg->pCont);
-      return; // todo change the error code
-    }
-    pMsg->pCont += sizeof(*pMsgVersion);
-    pMsg->contLen -= sizeof(*pMsgVersion);
-
     (*dnodeProcessShellMsgFp[pMsg->msgType])(pMsg);
-
-    //pMsg->contLen += sizeof(*pMsgVersion);
-    rpcFreeCont(pMsg->pCont - sizeof(*pMsgVersion));
   } else {
     dError("RPC %p, shell msg:%s is not processed", pMsg->handle, taosMsg[pMsg->msgType]);
     rpcMsg.code = TSDB_CODE_DND_MSG_NOT_PROCESSED;
@@ -244,4 +231,4 @@ SStatisInfo dnodeGetStatisInfo() {
   }
 
   return info;
-}
+}
\ No newline at end of file
diff --git a/src/dnode/src/dnodeVRead.c b/src/dnode/src/dnodeVRead.c
index 2995116ef56bfa9b6f70642944b13796ff4adc92..3f31e4937052d7a505031b4c8083ae1acd00bf6c 100644
--- a/src/dnode/src/dnodeVRead.c
+++ b/src/dnode/src/dnodeVRead.c
@@ -77,6 +77,8 @@ void dnodeDispatchToVReadQueue(SRpcMsg *pMsg) {
     SRpcMsg rpcRsp = {.handle = pMsg->handle, .code = TSDB_CODE_VND_INVALID_VGROUP_ID};
     rpcSendResponse(&rpcRsp);
   }
+
+  rpcFreeCont(pMsg->pCont);
 }
 
 void *dnodeAllocVQueryQueue(void *pVnode) {
diff --git a/src/dnode/src/dnodeVWrite.c b/src/dnode/src/dnodeVWrite.c
index 959789a6d24c507782527eea8b305d36445f55a9..a5ae8ac83063c599ad4c215bd0a7fa4468810580 100644
--- a/src/dnode/src/dnodeVWrite.c
+++ b/src/dnode/src/dnodeVWrite.c
@@ -102,6 +102,7 @@ void dnodeDispatchToVWriteQueue(SRpcMsg *pRpcMsg) {
   }
 
   vnodeRelease(pVnode);
+  rpcFreeCont(pRpcMsg->pCont);
 }
 
 void *dnodeAllocVWriteQueue(void *pVnode) {
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index b0c7c0895f50c83f28cc8cbe22ef1ac9002793a2..b7f0de54fef5965490ea40f07f80c6c3587d01cd 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -198,11 +198,6 @@ typedef struct {
   int32_t numOfVnodes;
 } SMsgDesc;
 
-typedef struct SMsgVersion {
-  char     clientVersion[TSDB_VERSION_LEN];
-  uint32_t crc;
-} SMsgVersion;
-
 typedef struct SMsgHead {
   int32_t contLen;
   int32_t vgId;
diff --git a/src/mnode/src/mnodeMnode.c b/src/mnode/src/mnodeMnode.c
index b60b308cf8bfe594315713e46bf40a2ebf65e1d6..8b3b2896fffa3e767028f87c52b36f21331c2234 100644
--- a/src/mnode/src/mnodeMnode.c
+++ b/src/mnode/src/mnodeMnode.c
@@ -294,6 +294,11 @@ void mnodeGetMnodeEpSetForShell(SRpcEpSet *epSet, bool redirect) {
   *epSet = tsMEpForShell;
   mnodeMnodeUnLock();
 
+  if (mnodeGetDnodesNum() <= 1) {
+    epSet->numOfEps = 0;
+    return;
+  }
+
   mTrace("vgId:1, mnodes epSet for shell is returned, num:%d inUse:%d", tsMEpForShell.numOfEps, tsMEpForShell.inUse);
   for (int32_t i = 0; i < epSet->numOfEps; ++i) {
     if (redirect && strcmp(epSet->fqdn[i], tsLocalFqdn) == 0 && htons(epSet->port[i]) == tsServerPort) {
diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y
index e275c50e89aa441e5bb170b04a3c35e0d48191fb..32e2721103255272f01bbb17ee5daf2ef34f3ed0 100644
--- a/src/query/inc/sql.y
+++ b/src/query/inc/sql.y
@@ -346,8 +346,8 @@ create_table_args(A) ::= ifnotexists(U) ids(V) cpxName(Z) AS select(S). {
   A = tSetCreateSQLElems(NULL, NULL, S, TSQL_CREATE_STREAM);
   setSQLInfo(pInfo, A, NULL, TSDB_SQL_CREATE_TABLE);
 
-  U.n += Z.n;
-  setCreatedTableName(pInfo, &U, &V);
+  V.n += Z.n;
+  setCreatedTableName(pInfo, &V, &U);
 }
 
 %type column{TAOS_FIELD}
diff --git a/src/query/src/sql.c b/src/query/src/sql.c
index 3a8eb23cf8384c946d7ecb417309fde311faa7d4..045036676d14692ae394c010fd1a20cf2b20157f 100644
--- a/src/query/src/sql.c
+++ b/src/query/src/sql.c
@@ -2420,8 +2420,8 @@ static void yy_reduce(
   yylhsminor.yy538 = tSetCreateSQLElems(NULL, NULL, yymsp[0].minor.yy84, TSQL_CREATE_STREAM);
   setSQLInfo(pInfo, yylhsminor.yy538, NULL, TSDB_SQL_CREATE_TABLE);
 
-  yymsp[-4].minor.yy0.n += yymsp[-2].minor.yy0.n;
-  setCreatedTableName(pInfo, &yymsp[-4].minor.yy0, &yymsp[-3].minor.yy0);
+  yymsp[-3].minor.yy0.n += yymsp[-2].minor.yy0.n;
+  setCreatedTableName(pInfo, &yymsp[-3].minor.yy0, &yymsp[-4].minor.yy0);
 }
   yymsp[-4].minor.yy538 = yylhsminor.yy538;
         break;