diff --git a/src/include/columnar/columnar_storage.h b/src/include/columnar/columnar_storage.h
index cf9c7ae59..a8ac01432 100644
--- a/src/include/columnar/columnar_storage.h
+++ b/src/include/columnar/columnar_storage.h
@@ -24,8 +24,8 @@
 #define COLUMNAR_FIRST_ROW_NUMBER ((uint64) 1)
 #define COLUMNAR_MAX_ROW_NUMBER ((uint64) \
 								 (COLUMNAR_FIRST_ROW_NUMBER + \
-								  (uint64) VALID_ITEMPOINTER_OFFSETS * \
-								  (uint64) VALID_BLOCKNUMBERS))
+								  VALID_ITEMPOINTER_OFFSETS * \
+								  VALID_BLOCKNUMBERS))
 
 
 /*
diff --git a/src/include/columnar/columnar_tableam.h b/src/include/columnar/columnar_tableam.h
index d5a4bfb02..bdd9ee658 100644
--- a/src/include/columnar/columnar_tableam.h
+++ b/src/include/columnar/columnar_tableam.h
@@ -29,7 +29,7 @@
  * For this reason, we restrict itemPointer.offsetNumber
  * to the following interval: [FirstOffsetNumber, MaxOffsetNumber).
  */
-#define VALID_ITEMPOINTER_OFFSETS (MaxOffsetNumber - FirstOffsetNumber)
+#define VALID_ITEMPOINTER_OFFSETS ((uint64) (MaxOffsetNumber - FirstOffsetNumber))
 
 /*
  * Number of valid ItemPointer BlockNumber's for "row number" <> "ItemPointer"
@@ -43,7 +43,7 @@
  * For this reason, we restrict itemPointer.blockNumber
  * to the following interval: [0, MaxBlockNumber].
  */
-#define VALID_BLOCKNUMBERS (MaxBlockNumber + 1)
+#define VALID_BLOCKNUMBERS ((uint64) (MaxBlockNumber + 1))
 
 
 const TableAmRoutine * GetColumnarTableAmRoutine(void);