diff --git a/kernel/ap.c b/kernel/ap.c
index edce3a92..4ac99459 100644
--- a/kernel/ap.c
+++ b/kernel/ap.c
@@ -17,6 +17,7 @@ void ap_idle(void)
 static void ap_wait(void)
 {
 	while (ap_stop) {
+		barrier();
 		cpu_pause();
 	}
 
@@ -44,7 +45,7 @@ void ap_init(void)
 		return;
 	}
 
-	kprintf("BSP HW ID = %d\n", bsp_hw_id);
+	kprintf("BSP HW ID = %d, ", bsp_hw_id);
 	kprintf("AP Booting :");
 	for (i = 0; i < cpu_info->ncpus; i++) {
 		if (cpu_info->hw_ids[i] == bsp_hw_id) {
diff --git a/kernel/mem.c b/kernel/mem.c
index 6070125e..8ee1ba53 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -46,6 +46,7 @@ static void page_fault_handler(unsigned long address, void *regs)
 {
 	kprintf("Page fault for %016lx\n", address);
 	/* TODO */
+	aal_mc_debug_show_interrupt_context(regs);
 	panic("page fault");
 }