Index: kernel/generic/src/debug/symtab.c
===================================================================
--- kernel/generic/src/debug/symtab.c	(revision 93a33481a1d1d5573982b7a547f23b5955e928b5)
+++ kernel/generic/src/debug/symtab.c	(revision 8ed4014bd99932e9f124b453fe8252eeda6db443)
@@ -40,4 +40,6 @@
 #include <func.h>
 #include <print.h>
+#include <arch/types.h>
+#include <typedefs.h>
 
 /** Return entry that seems most likely to correspond to argument.
@@ -140,5 +142,5 @@
 		addr =  uint64_t_le2host(symbol_table[i].address_le);
 		realname = symbol_table[i].symbol_name;
-		printf("%.*p: %s\n", sizeof(uintptr_t) * 2, addr, realname);
+		printf("%p: %s\n", addr, realname);
 		i++;
 	}
Index: kernel/generic/src/synch/rwlock.c
===================================================================
--- kernel/generic/src/synch/rwlock.c	(revision 93a33481a1d1d5573982b7a547f23b5955e928b5)
+++ kernel/generic/src/synch/rwlock.c	(revision 8ed4014bd99932e9f124b453fe8252eeda6db443)
@@ -232,5 +232,5 @@
 			break;
 		case ESYNCH_OK_ATOMIC:
-			panic("_mutex_lock_timeout()==ESYNCH_OK_ATOMIC\n");
+			panic("_mutex_lock_timeout() == ESYNCH_OK_ATOMIC\n");
 			break;
 		default:
Index: kernel/generic/src/synch/spinlock.c
===================================================================
--- kernel/generic/src/synch/spinlock.c	(revision 93a33481a1d1d5573982b7a547f23b5955e928b5)
+++ kernel/generic/src/synch/spinlock.c	(revision 8ed4014bd99932e9f124b453fe8252eeda6db443)
@@ -107,7 +107,6 @@
 #endif
 		if (i++ > DEADLOCK_THRESHOLD) {
-			printf("cpu%d: looping on spinlock %.*p:%s, "
-			    "caller=%.*p", CPU->id, sizeof(uintptr_t) * 2, sl,
-			    sl->name, sizeof(uintptr_t) * 2, CALLER);
+			printf("cpu%u: looping on spinlock %" PRIp ":%s, caller=%" PRIp,
+				CPU->id, sl, sl->name, CALLER);
 			symbol = get_symtab_entry(CALLER);
 			if (symbol)
@@ -120,5 +119,5 @@
 
 	if (deadlock_reported)
-		printf("cpu%d: not deadlocked\n", CPU->id);
+		printf("cpu%u: not deadlocked\n", CPU->id);
 
 	/*