diff --git a/xtoskrnl/ke/amd64/kthread.c b/xtoskrnl/ke/amd64/kthread.c
index 974a86cb..096d7d68 100644
--- a/xtoskrnl/ke/amd64/kthread.c
+++ b/xtoskrnl/ke/amd64/kthread.c
@@ -82,7 +82,7 @@ KepInitializeThreadContext(IN PKTHREAD Thread,
         ThreadFrame->TrapFrame.Dr7 = 0;
 
         /* Set initial MXCSR register value */
-        // ThreadFrame->TrapFrame.MxCsr = INITIAL_MXCSR;
+        ThreadFrame->TrapFrame.MxCsr = INITIAL_MXCSR;
 
         /* Initialize exception frame */
         ThreadFrame->ExceptionFrame.P1Home = (ULONG64)StartContext;
diff --git a/xtoskrnl/ke/i686/kthread.c b/xtoskrnl/ke/i686/kthread.c
index c5cb8a5f..441911a7 100644
--- a/xtoskrnl/ke/i686/kthread.c
+++ b/xtoskrnl/ke/i686/kthread.c
@@ -80,19 +80,13 @@ KepInitializeThreadContext(IN PKTHREAD Thread,
         ThreadFrame->TrapFrame.Dr6 = 0;
         ThreadFrame->TrapFrame.Dr7 = 0;
 
-        /* Set exception list pointer in the trap frame */
-        // ThreadFrame->TrapFrame.ExceptionList = (PEXCEPTION_REGISTRATION_RECORD) - 1;
-
         /* Set DS, ES and SS segments for user mode */
         ThreadFrame->TrapFrame.SegDs |= RPL_MASK;
         ThreadFrame->TrapFrame.SegEs |= RPL_MASK;
         ThreadFrame->TrapFrame.SegSs |= RPL_MASK;
 
-        /* Set debug mark in the trap frame */
-        // ThreadFrame->TrapFrame.DbgMark = 0x8BADF00D;
-
         /* Set user mode thread in the trap frame */
-        // ThreadFrame->TrapFrame.PreviousMode = UserMode;
+        ThreadFrame->TrapFrame.PreviousMode = UserMode;
     }
     else
     {