diff --git a/Kernel/arch/x86/desctab.asm b/Kernel/arch/x86/desctab.asm
index 8c7d320eba90201412fb483ab031b82a5741816e..6eaa651a239657c58ab6b6d0a77e37285f7ae356 100644
--- a/Kernel/arch/x86/desctab.asm
+++ b/Kernel/arch/x86/desctab.asm
@@ -188,7 +188,7 @@ Isr0xEE:
 	push eax	; Line up with interrupt number
 	mov eax, dr1	; CPU Number
 	push eax
-	mov eax, [esp-4]	; Load EAX back
+	mov eax, [esp+4]	; Load EAX back
 	jmp SchedulerBase
 ; Spurious Interrupt
 [global Isr0xEF]
@@ -323,3 +323,5 @@ IRQCommon:
 	popa
 	add esp, 8	; Error Code and ID
 	iret
+
+; vim: ft=nasm ts=8
diff --git a/Kernel/arch/x86/proc.c b/Kernel/arch/x86/proc.c
index 7d54d0c2ea1004121fe48b859f88d5a3bc6e53dd..30f318f38c511fc1f4c53d3e97e960a3ed976374 100644
--- a/Kernel/arch/x86/proc.c
+++ b/Kernel/arch/x86/proc.c
@@ -973,6 +973,7 @@ void Proc_Reschedule(void)
  */
 void Proc_Scheduler(int CPU)
 {
+#if 0
 	tThread	*thread;
 	
 	// If the spinlock is set, let it complete
@@ -1005,7 +1006,6 @@ void Proc_Scheduler(int CPU)
 			regs->eflags &= ~0x100;	// Clear TF
 	}
 
-#if 0
 	// TODO: Ack timer?
 	#if USE_MP
 	if( GetCPUNum() )