diff --git a/lisp/Linux-os.c b/lisp/Linux-os.c
index 5f3c8685b5c99bd59cfe960754b27cb598bf6b46..aedd4a456cc7930edd795e1a9ee8d9401efbcc57 100644
--- a/lisp/Linux-os.c
+++ b/lisp/Linux-os.c
@@ -15,7 +15,7 @@
  * GENCGC support by Douglas Crosher, 1996, 1997.
  * Alpha support by Julian Dolby, 1999.
  *
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Linux-os.c,v 1.19 2004/06/07 15:24:08 rtoy Exp $
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Linux-os.c,v 1.20 2004/07/08 04:10:09 rtoy Exp $
  *
  */
 
@@ -151,7 +151,7 @@ os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len)
   else
     flags |= MAP_VARIABLE;
 
-  DPRINTF(0, (stderr, "os_validate %x %d => ", addr, len));
+  DPRINTF(0, (stderr, "os_validate %p %d => ", addr, len));
 
   addr = mmap(addr, len, OS_VM_PROT_ALL, flags, -1, 0);
 
@@ -161,14 +161,14 @@ os_vm_address_t os_validate(os_vm_address_t addr, os_vm_size_t len)
       return NULL;
     }
 
-  DPRINTF(0, (stderr, "%x\n", addr));
+  DPRINTF(0, (stderr, "%p\n", addr));
 
   return addr;
 }
 
 void os_invalidate(os_vm_address_t addr, os_vm_size_t len)
 {
-  DPRINTF(0, (stderr, "os_invalidate %x %d\n", addr, len));
+  DPRINTF(0, (stderr, "os_invalidate %p %d\n", addr, len));
 
   if (munmap(addr, len) == -1)
     perror("munmap");
@@ -227,7 +227,7 @@ boolean valid_addr(os_vm_address_t addr)
 
 #if defined GENCGC
 
-static sigsegv_handle_now(HANDLER_ARGS)
+static void sigsegv_handle_now(HANDLER_ARGS)
 {
   interrupt_handle_now(signal, contextstruct);
 }
@@ -244,7 +244,7 @@ void sigsegv_handler(HANDLER_ARGS)
   int  page_index = find_page_index((void *) fault_addr);
 
 #ifdef RED_ZONE_HIT
-  if (os_control_stack_overflow (fault_addr, &contextstruct))
+  if (os_control_stack_overflow ((void *) fault_addr, &contextstruct))
     return;
 #endif
 
@@ -265,7 +265,7 @@ void sigsegv_handler(HANDLER_ARGS)
 #if defined(__x86_64)
   DPRINTF(0,(stderr,"sigsegv: rip: %p\n",context->rip));
 #else
-  DPRINTF(0,(stderr,"sigsegv: eip: %p\n",context->eip));
+  DPRINTF(0,(stderr,"sigsegv: eip: %lx\n",context->eip));
 #endif
   sigsegv_handle_now(signal, contextstruct);
 }
diff --git a/lisp/backtrace.c b/lisp/backtrace.c
index c838623aaa8827c693948e7d12d653f978855893..8a3ca1248002378505f467a2d4cd8bb735abc875 100644
--- a/lisp/backtrace.c
+++ b/lisp/backtrace.c
@@ -1,4 +1,4 @@
-/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/backtrace.c,v 1.10 2004/07/07 22:22:59 rtoy Exp $
+/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/backtrace.c,v 1.11 2004/07/08 04:10:09 rtoy Exp $
  *
  * Simple backtrace facility.  More or less from Rob's lisp version.
  */
@@ -520,7 +520,7 @@ backtrace (int nframes)
       else if (p)
 	printf ("<Not implemented, type = %d>", (int) TypeOf (*p));
       else
-	printf ("Foreign fp = 0x%x, ra = 0x%x", next_fp, ra);
+	printf ("Foreign fp = 0x%x, ra = 0x%lx", next_fp, ra);
 
       putchar ('\n');
       fp = next_fp;
diff --git a/lisp/monitor.c b/lisp/monitor.c
index a79ef195480bf5a357e4837fa283692071da96b5..46b5749d0eda7255cea568feb6b612201bec7da0 100644
--- a/lisp/monitor.c
+++ b/lisp/monitor.c
@@ -1,4 +1,4 @@
-/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/monitor.c,v 1.15 2004/07/07 15:03:12 rtoy Exp $ */
+/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/monitor.c,v 1.16 2004/07/08 04:10:09 rtoy Exp $ */
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -144,7 +144,7 @@ static void regs_cmd(char **ptr)
     printf("BSP\t=\t0x%08X\n", (unsigned long)current_binding_stack_pointer);
 #endif
 #if defined(i386) || defined(__x86_64)
-    printf("BSP\t=\t0x%08X\n", SymbolValue(BINDING_STACK_POINTER));
+    printf("BSP\t=\t0x%08lX\n", SymbolValue(BINDING_STACK_POINTER));
 #endif
 
     printf("DYNAMIC\t=\t0x%08lX\n", (unsigned long)current_dynamic_space);
@@ -409,7 +409,7 @@ static void catchers_cmd(char **ptr)
 		   catch->current_code,
 		   catch->entry_pc);
 #else
-            printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\tcode: 0x%08lx\n\tentry: 0x%08lx\n\ttag: ",
+            printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\tcode: 0x%p\n\tentry: 0x%08lx\n\ttag: ",
 		   (unsigned long)catch, (unsigned long)(catch->current_uwp),
 		   (unsigned long)(catch->current_cont),
 		   component_ptr_from_pc((lispobj *)catch->entry_pc) + type_OtherPointer,
diff --git a/lisp/print.c b/lisp/print.c
index 0a7175b2397ab01ed823205c946491dad17bf77b..ce7c6fa38d4a5c2f19e6daaa90fad985a9d762bd 100644
--- a/lisp/print.c
+++ b/lisp/print.c
@@ -1,4 +1,4 @@
-/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/print.c,v 1.14 2003/07/19 14:10:16 emarsden Exp $ */
+/* $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/print.c,v 1.15 2004/07/08 04:10:09 rtoy Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -523,7 +523,7 @@ static void print_otherptr(lispobj obj)
 
             case type_InstanceHeader:
                 NEWLINE;
-                printf("length = %ld", count);
+                printf("length = %d", count);
                 index = 0;
                 while (count-- > 0) {
                     sprintf(buffer, "%d: ", index++);