diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index 343f8d20709a55c2c9861e8d975b8ab72b09b851..25814a748e4bb1a1951c93979e26daabeffe6e2e 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -304,7 +304,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size, void* buf
 #define TSDB_MIN_VNODES           64
 #define TSDB_MAX_VNODES           2048
 #define TSDB_MIN_VNODES_PER_DB    2
-#define TSDB_MAX_VNODES_PER_DB    16
+#define TSDB_MAX_VNODES_PER_DB    64
 
 #define TSDB_DNODE_ROLE_ANY       0
 #define TSDB_DNODE_ROLE_MGMT      1
diff --git a/src/util/inc/tscompression.h b/src/util/inc/tscompression.h
index 37d1e7b5909cf68f4dc7a25803f94442dc2cf7b0..cca6d6e25054e7736ea28590fa4cb5ab788d6b07 100644
--- a/src/util/inc/tscompression.h
+++ b/src/util/inc/tscompression.h
@@ -26,7 +26,7 @@ extern "C" {
 #define COMP_OVERFLOW_BYTES 2
 #define BITS_PER_BYTE 8
 // Masks
-#define INT64MASK(_x) ((1ul << _x) - 1)
+#define INT64MASK(_x) ((((uint64_t)1) << _x) - 1)
 #define INT32MASK(_x) (((uint32_t)1 << _x) - 1)
 #define INT8MASK(_x) (((uint8_t)1 << _x) - 1)
 // Compression algorithm