diff --git a/bochs/cpu/cpu.cc b/bochs/cpu/cpu.cc
index 4b20b63b8..cad04c157 100644
--- a/bochs/cpu/cpu.cc
+++ b/bochs/cpu/cpu.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cpu.cc,v 1.200 2008-01-10 20:26:49 sshwarts Exp $
+// $Id: cpu.cc,v 1.201 2008-01-10 20:32:23 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -428,7 +428,7 @@ void BX_CPU_C::cpu_loop(Bit32u max_instr_count)
 
       // decoding instruction compeleted -> continue with execution
       BX_INSTR_BEFORE_EXECUTION(BX_CPU_ID, i);
-      EIP += i->ilen();
+      RIP += i->ilen();
       BX_CPU_CALL_METHOD(i->execute, (i)); // might iterate repeat instruction
       BX_CPU_THIS_PTR prev_rip = RIP; // commit new RIP
       BX_INSTR_AFTER_EXECUTION(BX_CPU_ID, i);
diff --git a/bochs/cpu/cpu.h b/bochs/cpu/cpu.h
index 10df00521..f206c0cd1 100644
--- a/bochs/cpu/cpu.h
+++ b/bochs/cpu/cpu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cpu.h,v 1.409 2008-01-10 20:26:49 sshwarts Exp $
+// $Id: cpu.h,v 1.410 2008-01-10 20:32:23 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -1190,13 +1190,13 @@ public: // for now...
 #define BX_DEBUG_TRAP_SPECIAL       (0xf8000000)
 
   Bit32u   debug_trap; // holds DR6 value (16bit) to be set as well
-  /*volatile*/ Bit32u  async_event;
+  volatile Bit32u  async_event;
 
 #define BX_ASYNC_EVENT_STOP_TRACE   (0x80000000)
 
-  /*volatile*/ bx_bool INTR;
-  /*volatile*/ bx_bool smi_pending;
-  /*volatile*/ bx_bool nmi_pending;
+  volatile bx_bool INTR;
+  volatile bx_bool smi_pending;
+  volatile bx_bool nmi_pending;
 
   // for exceptions
   jmp_buf jmp_buf_env;