Index: generic/src/console/cmd.c
===================================================================
--- generic/src/console/cmd.c	(revision 1bb2e7a3ca385e067db5d9c4c5654c28f92af609)
+++ generic/src/console/cmd.c	(revision e3e29b75fa0f544d0b31734b0f089041e4127446)
@@ -535,5 +535,5 @@
 		symbol = get_symtab_entry(symaddr);
 
-		printf("Calling f(0x%zX): %.*p: %s\n", arg1, sizeof(__address) * 2, symaddr, symbol);
+		printf("Calling f(%#zx): %.*p: %s\n", arg1, sizeof(__address) * 2, symaddr, symbol);
 #ifdef ia64
 		fptr.f = symaddr;
Index: generic/src/ipc/ipc.c
===================================================================
--- generic/src/ipc/ipc.c	(revision 1bb2e7a3ca385e067db5d9c4c5654c28f92af609)
+++ generic/src/ipc/ipc.c	(revision e3e29b75fa0f544d0b31734b0f089041e4127446)
@@ -479,13 +479,13 @@
 				break;
 			case IPC_PHONE_CONNECTED:
-				printf("connected to: %P ", 
+				printf("connected to: %p ", 
 				       task->phones[i].callee);
 				break;
 			case IPC_PHONE_SLAMMED:
-				printf("slammed by: %P ", 
+				printf("slammed by: %p ", 
 				       task->phones[i].callee);
 				break;
 			case IPC_PHONE_HUNGUP:
-				printf("hung up - was: %P ", 
+				printf("hung up - was: %p ", 
 				       task->phones[i].callee);
 				break;
@@ -504,5 +504,5 @@
 	for (tmp=task->answerbox.calls.next; tmp != &task->answerbox.calls;tmp = tmp->next) {
 		call = list_get_instance(tmp, call_t, link);
-		printf("Callid: %P Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
+		printf("Callid: %p Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
 		       call->sender->taskid, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
 		       IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags);
@@ -514,5 +514,5 @@
 	     tmp = tmp->next) {
 		call = list_get_instance(tmp, call_t, link);
-		printf("Callid: %P Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
+		printf("Callid: %p Srctask:%lld M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
 		       call->sender->taskid, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
 		       IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags);
@@ -522,5 +522,5 @@
 	for (tmp=task->answerbox.answers.next; tmp != &task->answerbox.answers; tmp = tmp->next) {
 		call = list_get_instance(tmp, call_t, link);
-		printf("Callid:%P M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
+		printf("Callid:%p M:%d A1:%d A2:%d A3:%d Flags:%x\n",call,
 		       IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
 		       IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data), call->flags);
Index: generic/src/mm/as.c
===================================================================
--- generic/src/mm/as.c	(revision 1bb2e7a3ca385e067db5d9c4c5654c28f92af609)
+++ generic/src/mm/as.c	(revision e3e29b75fa0f544d0b31734b0f089041e4127446)
@@ -1310,5 +1310,5 @@
 	}
 
-	panic("Inconsistency detected while adding %d pages of used space at %P.\n", count, page);
+	panic("Inconsistency detected while adding %d pages of used space at %p.\n", count, page);
 }
 
@@ -1464,5 +1464,5 @@
 
 error:
-	panic("Inconsistency detected while removing %d pages of used space from %P.\n", count, page);
+	panic("Inconsistency detected while removing %d pages of used space from %p.\n", count, page);
 }
 
Index: generic/src/proc/task.c
===================================================================
--- generic/src/proc/task.c	(revision 1bb2e7a3ca385e067db5d9c4c5654c28f92af609)
+++ generic/src/proc/task.c	(revision e3e29b75fa0f544d0b31734b0f089041e4127446)
@@ -356,9 +356,9 @@
 		
 			spinlock_lock(&t->lock);
-			printf("%s(%lld): address=%#zX, as=%#zX, ActiveCalls: %zd",
+			printf("%s(%lld): address=%#zx, as=%#zx, ActiveCalls: %zd",
 				t->name, t->taskid, t, t->as, atomic_get(&t->active_calls));
 			for (j=0; j < IPC_MAX_PHONES; j++) {
 				if (t->phones[j].callee)
-					printf(" Ph(%zd): %#zX ", j, t->phones[j].callee);
+					printf(" Ph(%zd): %#zx ", j, t->phones[j].callee);
 			}
 			printf("\n");
Index: generic/src/proc/thread.c
===================================================================
--- generic/src/proc/thread.c	(revision 1bb2e7a3ca385e067db5d9c4c5654c28f92af609)
+++ generic/src/proc/thread.c	(revision e3e29b75fa0f544d0b31734b0f089041e4127446)
@@ -537,5 +537,5 @@
 		
 			t = (thread_t *) node->value[i];
-			printf("%s: address=%#zX, tid=%zd, state=%s, task=%#zX, code=%#zX, stack=%#zX, cpu=",
+			printf("%s: address=%#zx, tid=%zd, state=%s, task=%#zx, code=%#zx, stack=%#zx, cpu=",
 				t->name, t, t->tid, thread_states[t->state], t->task, t->thread_code, t->kstack);
 			if (t->cpu)
@@ -544,6 +544,6 @@
 				printf("none");
 			if (t->state == Sleeping) {
-				printf(", kst=%#zX", t->kstack);
-				printf(", wq=%#zX", t->sleep_queue);
+				printf(", kst=%#zx", t->kstack);
+				printf(", wq=%#zx", t->sleep_queue);
 			}
 			printf("\n");
Index: generic/src/sysinfo/sysinfo.c
===================================================================
--- generic/src/sysinfo/sysinfo.c	(revision 1bb2e7a3ca385e067db5d9c4c5654c28f92af609)
+++ generic/src/sysinfo/sysinfo.c	(revision e3e29b75fa0f544d0b31734b0f089041e4127446)
@@ -245,5 +245,5 @@
 		}
 		
-		printf("%s    %s val:%d(%X) sub:%s\n", root->name, vtype, val, val, (root->subinfo_type == SYSINFO_SUBINFO_NONE) ? "NON" : ((root->subinfo_type == SYSINFO_SUBINFO_TABLE) ? "TAB" : "FUN"));
+		printf("%s    %s val:%d(%x) sub:%s\n", root->name, vtype, val, val, (root->subinfo_type == SYSINFO_SUBINFO_NONE) ? "NON" : ((root->subinfo_type == SYSINFO_SUBINFO_TABLE) ? "TAB" : "FUN"));
 		
 		if (root->subinfo_type == SYSINFO_SUBINFO_TABLE)