diff --git a/arch/x86/kernel/cpu.c b/arch/x86/kernel/cpu.c
index d86aecbd..9befbd40 100644
--- a/arch/x86/kernel/cpu.c
+++ b/arch/x86/kernel/cpu.c
@@ -1036,9 +1036,8 @@ unhandled_page_fault(struct thread *thread, void *fault_addr, void *regs)
 	unsigned long error = ((struct x86_user_context *)regs)->gpr.error;
 
 	irqflags = kprintf_lock();
-	dkprintf("[%d] Page fault for 0x%lX\n",
-			ihk_mc_get_processor_id(), address);
-	dkprintf("%s for %s access in %s mode (reserved bit %s set), "
+	__kprintf("Page fault for 0x%lx\n", address);
+	__kprintf("%s for %s access in %s mode (reserved bit %s set), "
 			"it %s an instruction fetch\n",
 			(error & PF_PROT ? "protection fault" : "no page found"),
 			(error & PF_WRITE ? "write" : "read"),
@@ -1050,14 +1049,14 @@ unhandled_page_fault(struct thread *thread, void *fault_addr, void *regs)
 	list_for_each_entry(range, &vm->vm_range_list, list) {
 		if (range->start <= address && range->end > address) {
 			found = 1;
-			dkprintf("address is in range, flag: 0x%X! \n",
+			__kprintf("address is in range, flag: 0x%lx\n",
 					range->flag);
 			ihk_mc_pt_print_pte(vm->address_space->page_table, (void*)address);
 			break;
 		}
 	}
 	if (!found) {
-		dkprintf("address is out of range! \n");
+		__kprintf("address is out of range! \n");
 	}
 
 	kprintf_unlock(irqflags);
diff --git a/kernel/debug.c b/kernel/debug.c
index 6c9a8214..1061b6fc 100644
--- a/kernel/debug.c
+++ b/kernel/debug.c
@@ -110,6 +110,7 @@ int __kprintf(const char *format, ...)
 	char buf[KPRINTF_LOCAL_BUF_LEN];
 
 	/* Copy into the local buf */
+	len = sprintf(buf, "[%3d]: ", ihk_mc_get_processor_id());
 	va_start(va, format);
 	len += vsnprintf(buf + len, KPRINTF_LOCAL_BUF_LEN - len - 2, format, va);
 	va_end(va);
diff --git a/kernel/mem.c b/kernel/mem.c
index 1fc11a10..f0e4c12b 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -342,10 +342,9 @@ static void page_fault_handler(void *fault_addr, uint64_t reason, void *regs)
 			// no return
 		}
 
-		kprintf("[%d]page_fault_handler(%p,%lx,%p):"
-				"fault vm failed. %d, TID: %d\n",
-				ihk_mc_get_processor_id(), fault_addr,
-				reason, regs, error, thread->tid);
+		kprintf("%s fault VM failed for TID: %d, addr: 0x%lx, "
+				"reason: %d, error: %d\n",
+				thread->tid, fault_addr, reason, error);
 		unhandled_page_fault(thread, fault_addr, regs);
 		preempt_enable();
 		memset(&info, '\0', sizeof info);