diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index 6eb2f7e9e9..dfc18da8cd 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -109,8 +109,10 @@ static timezone_t setConnnectionTz(const char* val){
 
   time_t    tx1 = taosGetTimestampSec();
   char output[TD_TIMEZONE_LEN] = {0};
-  taosFormatTimezoneStr(tx1, val, tz, output);
-  code = taosHashPut(pTimezoneNameMap, &tz, sizeof(timezone_t), output, strlen(output) + 1);
+  code = taosFormatTimezoneStr(tx1, val, tz, output);
+  if (code == 0){
+    code = taosHashPut(pTimezoneNameMap, &tz, sizeof(timezone_t), output, strlen(output) + 1);
+  }
   if (code != 0){
     tscError("failed to put timezone %s to map", val);
   }
@@ -122,23 +124,23 @@ END:
 
 static int32_t setConnectionOption(TAOS *taos, TSDB_OPTION_CONNECTION option, const char* val){
   if (taos == NULL) {
-    return TSDB_CODE_INVALID_PARA;
+    return terrno = TSDB_CODE_INVALID_PARA;
   }
 
 #ifdef WINDOWS
   if (option == TSDB_OPTION_CONNECTION_TIMEZONE){
-    return TSDB_CODE_NOT_SUPPORTTED_IN_WINDOWS;
+    return terrno = TSDB_CODE_NOT_SUPPORTTED_IN_WINDOWS;
   }
 #endif
 
   if (option < TSDB_OPTION_CONNECTION_CLEAR || option >= TSDB_MAX_OPTIONS_CONNECTION){
-    return TSDB_CODE_INVALID_PARA;
+    return terrno = TSDB_CODE_INVALID_PARA;
   }
 
   int32_t code = taos_init();
   // initialize global config
   if (code != 0) {
-    return code;
+    return terrno = code;
   }
 
   STscObj *pObj = acquireTscObj(*(int64_t *)taos);
@@ -208,7 +210,7 @@ static int32_t setConnectionOption(TAOS *taos, TSDB_OPTION_CONNECTION option, co
 
 END:
   releaseTscObj(*(int64_t *)taos);
-  return code;
+  return terrno = code;
 }
 
 int taos_options_connection(TAOS *taos, TSDB_OPTION_CONNECTION option, const void *arg, ...){
diff --git a/source/client/src/clientStmt2.c b/source/client/src/clientStmt2.c
index 39d222eb48..89a0fd3788 100644
--- a/source/client/src/clientStmt2.c
+++ b/source/client/src/clientStmt2.c
@@ -39,7 +39,7 @@ static FORCE_INLINE int32_t stmtAllocQNodeFromBuf(STableBufInfo* pTblBuf, void**
 }
 
 static bool stmtDequeue(STscStmt2* pStmt, SStmtQNode** param) {
-  while (0 == atomic_load_64(&pStmt->queue.qRemainNum)) {
+  while (0 == atomic_load_64((int64_t*)&pStmt->queue.qRemainNum)) {
     taosUsleep(1);
     return false;
   }
@@ -53,7 +53,7 @@ static bool stmtDequeue(STscStmt2* pStmt, SStmtQNode** param) {
 
   *param = node;
 
-  (void)atomic_sub_fetch_64(&pStmt->queue.qRemainNum, 1);
+  (void)atomic_sub_fetch_64((int64_t*)&pStmt->queue.qRemainNum, 1);
 
   return true;
 }
@@ -63,7 +63,7 @@ static void stmtEnqueue(STscStmt2* pStmt, SStmtQNode* param) {
   pStmt->queue.tail = param;
 
   pStmt->stat.bindDataNum++;
-  (void)atomic_add_fetch_64(&pStmt->queue.qRemainNum, 1);
+  (void)atomic_add_fetch_64((int64_t*)&pStmt->queue.qRemainNum, 1);
 }
 
 static int32_t stmtCreateRequest(STscStmt2* pStmt) {