diff --git a/arch/x86/mm/page.c b/arch/x86/mm/page.c
index 50631b49..aa952edf 100644
--- a/arch/x86/mm/page.c
+++ b/arch/x86/mm/page.c
@@ -611,10 +611,11 @@ static void pagefault_handler(struct state *s)
 	}
 
 default_handler:
-	kprintf("PAGE FAULT: Task %u got page fault at %p (irq %d)\n", task->id, viraddr, s->int_no);
+	kprintf("PAGE FAULT: Task %u got page fault at %p (irq %d, cs:eip 0x%x:0x%x)\n", task->id, viraddr, s->int_no, s->cs, s->eip);
 	kprintf("Register state: eax = 0x%x, ebx = 0x%x, ecx = 0x%x, edx = 0x%x, edi = 0x%x, esi = 0x%x, ebp = 0x%x, esp = 0x%x\n", 
 		s->eax, s->ebx, s->ecx, s->edx, s->edi, s->esi, s->ebp, s->esp);
 
+	irq_enable();
 	abort();
 }
 
diff --git a/kernel/tests.c b/kernel/tests.c
index 6870d81a..285366df 100644
--- a/kernel/tests.c
+++ b/kernel/tests.c
@@ -250,9 +250,7 @@ int test_init(void)
 	//sem_init(&consuming, 0);
 	//mailbox_int32_init(&mbox);
 
-	//create_kernel_task(NULL, foo, "Hello from foo1\n");
-	//create_kernel_task(NULL, join_test, NULL);
-#if defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK)
+#if 0 //defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK)
 	if (!RCCE_ue())
 		create_kernel_task(NULL,server_task,NULL);
 	else