diff --git a/src/backend/nodes/bitmapset.c b/src/backend/nodes/bitmapset.c
index c89f1144141..26f457a3509 100644
--- a/src/backend/nodes/bitmapset.c
+++ b/src/backend/nodes/bitmapset.c
@@ -522,7 +522,7 @@ bms_offset_members(const Bitmapset *a, int offset)
 
 			/*
 			 * We loop backward over the array so we correctly carry bits from
-			 * higher words before they're overwritten.
+			 * higher words.
 			 */
 			do
 			{
diff --git a/src/test/modules/test_bitmapset/test_bitmapset.c b/src/test/modules/test_bitmapset/test_bitmapset.c
index b99720685b9..0f366aadea0 100644
--- a/src/test/modules/test_bitmapset/test_bitmapset.c
+++ b/src/test/modules/test_bitmapset/test_bitmapset.c
@@ -797,7 +797,7 @@ Datum
 test_random_offset_operations(PG_FUNCTION_ARGS)
 {
 	pg_prng_state state;
-	uint64		seed;
+	int64		seed;
 	int			num_ops;
 	int			max_range;
 	int			min_value;
@@ -819,7 +819,7 @@ test_random_offset_operations(PG_FUNCTION_ARGS)
 	if (PG_ARGISNULL(3) || min_value < 0)
 		elog(ERROR, "invalid minimum value");
 
-	pg_prng_seed(&state, seed);
+	pg_prng_seed(&state, (uint64) seed);
 
 	for (int op = 0; op < num_ops; op++)
 	{