diff --git a/contrib/pageinspect/btreefuncs.cpp b/contrib/pageinspect/btreefuncs.cpp
index 7d5f0dd0e..620c3b828 100644
--- a/contrib/pageinspect/btreefuncs.cpp
+++ b/contrib/pageinspect/btreefuncs.cpp
@@ -108,7 +108,7 @@ static void GetBTPageStatistics(BlockNumber blkno, Buffer buffer, BTPageStat* st
         if (PageIs4BXidVersion(page))
             stat->btpo.xact = opaque->btpo.xact_old;
         else
-            stat->btop.xact = ((BTPageOpaque)opaque)->xact;
+            stat->btpo.xact = ((BTPageOpaque)opaque)->xact;
         return;
     } else if (P_IGNORE(opaque))
         stat->type = 'e';
diff --git a/contrib/pageinspect/rawpage.cpp b/contrib/pageinspect/rawpage.cpp
index eeb718694..ef9baae3e 100644
--- a/contrib/pageinspect/rawpage.cpp
+++ b/contrib/pageinspect/rawpage.cpp
@@ -226,9 +226,9 @@ Datum page_header(PG_FUNCTION_ARGS)
     values[6] = UInt16GetDatum(PageGetPageSize(page));
     values[7] = UInt16GetDatum(PageGetPageLayoutVersion(page));
     if (PageIs8BXidHeapVersion(page)) {
-        values[8] = TransactionIdGetDatum(page->pd_prune_xid + (HeapPageHeader)page->pd_xid_base);
-        values[9] = TransactionIdGetDatum((HeapPageHeader)page->pd_xid_base);
-        values[10] = TransactionIdGetDatum((HeapPageHeader)page->pd_multi_base);
+        values[8] = TransactionIdGetDatum(page->pd_prune_xid + ((HeapPageHeader)page)->pd_xid_base);
+        values[9] = TransactionIdGetDatum(((HeapPageHeader)page)->pd_xid_base);
+        values[10] = TransactionIdGetDatum(((HeapPageHeader)page)->pd_multi_base);
         nulls[8] = false;
         nulls[9] = false;
         nulls[10] = false;