diff --git a/src/create_shards.c b/src/create_shards.c
index 3c6b99a..fcf99ee 100644
--- a/src/create_shards.c
+++ b/src/create_shards.c
@@ -245,7 +245,7 @@ master_create_worker_shards(PG_FUNCTION_ARGS)
 		List *extendedDDLCommands = NIL;
 		int64 shardId = -1;
 		int32 placementCount = 0;
-		int32 roundRobinNodeIndex = shardIndex % workerNodeCount;
+		int32 roundRobinNodeIndex = (int32) shardIndex % workerNodeCount;
 
 		/* initialize the hash token space for this shard */
 		text *minHashTokenText = NULL;
diff --git a/src/ruleutils_93.c b/src/ruleutils_93.c
index 3d3b1ca..d3200c6 100644
--- a/src/ruleutils_93.c
+++ b/src/ruleutils_93.c
@@ -73,6 +73,7 @@
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wempty-body"
 #pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wswitch"
 
 
diff --git a/src/ruleutils_94.c b/src/ruleutils_94.c
index 9fdef2e..7ea66f1 100644
--- a/src/ruleutils_94.c
+++ b/src/ruleutils_94.c
@@ -75,6 +75,7 @@
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wempty-body"
 #pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wsign-conversion"
 #pragma GCC diagnostic ignored "-Wswitch"