diff --git a/src/backend/access/rmgrdesc/nbtdesc.c b/src/backend/access/rmgrdesc/nbtdesc.c
index e93ad981d03..e10cac43123 100644
--- a/src/backend/access/rmgrdesc/nbtdesc.c
+++ b/src/backend/access/rmgrdesc/nbtdesc.c
@@ -26,9 +26,9 @@ out_insert(StringInfo buf, uint8 info, XLogReaderState *record)
 	char		*ptr;
 	xl_btree_insert	*xlrec = (xl_btree_insert *) rec;
 	xl_btree_metadata *md;
-	BlockNumber	blkno;	
+	BlockNumber	blkno = InvalidBlockNumber;
 	bool		fullpage;
-	Size		datalen;
+	Size		datalen = 0;
 
 	fullpage = XLogRecHasBlockImage(record, 0);
 	XLogRecGetBlockTag(record, 0, NULL, NULL, &blkno);
diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c
index 2bb0c8a0e10..f8c064786e7 100644
--- a/src/bin/pg_upgrade/exec.c
+++ b/src/bin/pg_upgrade/exec.c
@@ -457,7 +457,7 @@ check_exec(const char *dir, const char *program, bool check_version)
 		pg_strip_crlf(line);
 
 		snprintf(versionstr, sizeof(versionstr), "%s (PostgreSQL) " PG_VERSION, program);
-		snprintf(versionstr, sizeof(versionstr), "%s (Apache Cloudberry) " PG_VERSION, program);
+		snprintf(gp_versionstr, sizeof(versionstr), "%s (Apache Cloudberry) " PG_VERSION, program);
 
 		if (strcmp(line, versionstr) != 0 && strcmp(line, gp_versionstr) != 0)
 			pg_fatal("check for \"%s\" failed: incorrect version: found \"%s\", expected \"%s\" or \"%s\"\n",