diff --git a/progs/xdemos/glxheads.c b/progs/xdemos/glxheads.c
index 605ccc3..428576d 100644
--- a/progs/xdemos/glxheads.c
+++ b/progs/xdemos/glxheads.c
@@ -1,4 +1,4 @@
-/* $Id: glxheads.c,v 1.3 2002/03/08 19:44:28 brianp Exp $ */
+/* $Id: glxheads.c,v 1.4 2003/04/21 14:51:16 brianp Exp $ */
 
 /*
  * Exercise multiple GLX connections on multiple X displays.
@@ -248,9 +248,9 @@
 PrintInfo(const struct head *h)
 {
    printf("Name: %s\n", h->DisplayName);
-   printf("  Display:     0x%x\n", (int) h->Dpy);
+   printf("  Display:     %p\n", h->Dpy);
    printf("  Window:      0x%x\n", (int) h->Win);
-   printf("  Context:     0x%x\n", (int) h->Context);
+   printf("  Context:     0x%lx\n", (long) h->Context);
    printf("  GL_VERSION:  %s\n", h->Version);
    printf("  GL_VENDOR:   %s\n", h->Vendor);
    printf("  GL_RENDERER: %s\n", h->Renderer);
diff --git a/progs/xdemos/manywin.c b/progs/xdemos/manywin.c
index 2a28bc3..a0286bd 100644
--- a/progs/xdemos/manywin.c
+++ b/progs/xdemos/manywin.c
@@ -1,5 +1,3 @@
-/* $Id: manywin.c,v 1.5 2001/11/26 17:21:46 brianp Exp $ */
-
 /*
  * Create N GLX windows/contexts and render to them in round-robin
  * order.
@@ -284,7 +282,7 @@
    printf("Name: %s\n", h->DisplayName);
    printf("  Display:     %p\n", (void *) h->Dpy);
    printf("  Window:      0x%x\n", (int) h->Win);
-   printf("  Context:     0x%x\n", (int) h->Context);
+   printf("  Context:     0x%lx\n", (long) h->Context);
    printf("  GL_VERSION:  %s\n", h->Version);
    printf("  GL_VENDOR:   %s\n", h->Vendor);
    printf("  GL_RENDERER: %s\n", h->Renderer);
diff --git a/progs/xdemos/pbinfo.c b/progs/xdemos/pbinfo.c
index e4e5281..f0b2f0e 100644
--- a/progs/xdemos/pbinfo.c
+++ b/progs/xdemos/pbinfo.c
@@ -1,4 +1,4 @@
-/* $Id: pbinfo.c,v 1.1 2002/10/05 18:30:13 brianp Exp $ */
+/* $Id: pbinfo.c,v 1.2 2003/04/21 14:51:16 brianp Exp $ */
 
 /*
  * Print list of fbconfigs and test each to see if a pbuffer can be created
@@ -49,6 +49,7 @@
    fbConfigs = glXChooseFBConfigSGIX(dpy, screen, fbAttribs, &nConfigs);
 #else
    /* GLX 1.3 method */
+   (void) fbAttribs;
    fbConfigs = glXGetFBConfigs(dpy, screen, &nConfigs);
 #endif