diff --git a/include/asm/ks386.template.h b/include/asm/ks386.template.h
index 8b874089fa6..956305739d7 100644
--- a/include/asm/ks386.template.h
+++ b/include/asm/ks386.template.h
@@ -271,8 +271,8 @@ OFFSET(KPCR_PRCB_DEFERRED_READY_LIST_HEAD, KIPCR, PrcbData.DeferredReadyListHead
 OFFSET(KPCR_PRCB_POWER_STATE_IDLE_FUNCTION, KIPCR, PrcbData.PowerState.IdleFunction),
 
 HEADER("KTRAP_FRAME"),
-//OFFSET(KTRAP_FRAME_DEBUGEBP                    0x0
-//OFFSET(KTRAP_FRAME_DEBUGEIP                    0x4
+OFFSET(KTRAP_FRAME_DEBUGEBP, KTRAP_FRAME, DbgEbp),
+OFFSET(KTRAP_FRAME_DEBUGEIP, KTRAP_FRAME, DbgEip),
 //OFFSET(KTRAP_FRAME_DEBUGARGMARK                0x8
 //OFFSET(KTRAP_FRAME_DEBUGPOINTER                0xC
 //OFFSET(KTRAP_FRAME_TEMPCS                      0x10
@@ -410,12 +410,12 @@ OFFSET(KTHREAD_WAIT_REASON, KTHREAD, WaitReason),
 //OFFSET(KTHREAD_SWAP_BUSY                       0x5D
 //OFFSET(KTHREAD_SERVICE_TABLE                   0x118
 //OFFSET(KTHREAD_PREVIOUS_MODE                   0xD7
-//OFFSET(KTHREAD_COMBINED_APC_DISABLE            0x70
+OFFSET(KTHREAD_COMBINED_APC_DISABLE, KTHREAD, CombinedApcDisable),
 OFFSET(KTHREAD_SPECIAL_APC_DISABLE, KTHREAD, SpecialApcDisable),
 OFFSET(KTHREAD_LARGE_STACK, KTHREAD, LargeStack),
 OFFSET(KTHREAD_TRAP_FRAME, KTHREAD, TrapFrame),
 OFFSET(KTHREAD_CALLBACK_STACK, KTHREAD, CallbackStack),
-//OFFSET(KTHREAD_APC_STATE_INDEX                 0x11C
+OFFSET(KTHREAD_APC_STATE_INDEX, KTHREAD, ApcStateIndex),
 OFFSET(KTHREAD_STACK_BASE, KTHREAD, StackBase),
 //OFFSET(KTHREAD_QUANTUM                         0x15D
 //OFFSET(KTHREAD_KERNEL_TIME                     0x160