diff --git a/src/inc/ttype.h b/src/inc/ttype.h
index 3a70a970e3..05622a16be 100644
--- a/src/inc/ttype.h
+++ b/src/inc/ttype.h
@@ -99,7 +99,7 @@ typedef struct tstr {
         *(uint32_t *)(_v) = (uint32_t)(_data); \
         break;                                 \
       default:                                 \
-        *(int32_t *)(_v) = (_data);            \
+        *(int32_t *)(_v) = (int32_t)(_data);   \
         break;                                 \
     }                                          \
   } while (0)
diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c
index 9d05677752..12c8a16f1f 100644
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -3778,7 +3778,7 @@ void twa_function_finalizer(SQLFunctionCtx *pCtx) {
  */
 
 static void interp_function_impl(SQLFunctionCtx *pCtx) {
-  int32_t type = pCtx->param[2].i64;
+  int32_t type = (int32_t) pCtx->param[2].i64;
   if (type == TSDB_FILL_NONE) {
     return;
   }