diff --git a/hw/xbox/nv2a/pgraph.c b/hw/xbox/nv2a/pgraph.c
index d169ae43e7..ee0d7ebc34 100644
--- a/hw/xbox/nv2a/pgraph.c
+++ b/hw/xbox/nv2a/pgraph.c
@@ -5912,7 +5912,7 @@ static void pgraph_bind_textures(NV2AState *d)
                                               NV_PGRAPH_TEXFMT0_BORDER_SOURCE);
         uint32_t border_color = pg->regs[NV_PGRAPH_BORDERCOLOR0 + i*4];
 
-        unsigned int offset = pg->regs[NV_PGRAPH_TEXOFFSET0 + i*4];
+        hwaddr offset = pg->regs[NV_PGRAPH_TEXOFFSET0 + i*4];
 
         bool palette_dma_select =
             GET_MASK(palette, NV_PGRAPH_TEXPALETTE0_CONTEXT_DMA);
diff --git a/hw/xbox/nv2a/pramdac.c b/hw/xbox/nv2a/pramdac.c
index a9288a32f4..14ed307125 100644
--- a/hw/xbox/nv2a/pramdac.c
+++ b/hw/xbox/nv2a/pramdac.c
@@ -74,7 +74,8 @@ uint64_t pramdac_read(void *opaque, hwaddr addr, unsigned int size)
     /* Surprisingly, QEMU doesn't handle unaligned access for you properly */
     r >>= 32 - 8 * size - 8 * (addr & 3);
 
-    NV2A_DPRINTF("PRAMDAC: read %d [0x%" HWADDR_PRIx "] -> %llx\n", size, addr, r);
+    NV2A_DPRINTF("PRAMDAC: read %d [0x%" HWADDR_PRIx "] -> %" PRIx64 "\n", size,
+                 addr, r);
     return r;
 }