diff --git a/bochs/cpu/apic.cc b/bochs/cpu/apic.cc
index 0372da738..f757d2c30 100644
--- a/bochs/cpu/apic.cc
+++ b/bochs/cpu/apic.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: apic.cc,v 1.119 2009-02-18 22:24:52 sshwarts Exp $
+// $Id: apic.cc,v 1.120 2009-02-18 22:33:06 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (c) 2002 Zwane Mwaikambo, Stanislav Shwartsman
@@ -236,7 +236,7 @@ void bx_local_apic_c::set_base(bx_phy_address newbase)
   newbase &= ~((bx_phy_address) 0xfff);
   base_addr = newbase;
   if (id != APIC_UNKNOWN_ID)
-    BX_INFO(("relocate APIC id=%d to 0x" FMT_PHY_ADDRX, id, newbase));
+    BX_INFO(("allocate APIC id=%d to 0x" FMT_PHY_ADDRX, id, newbase));
 }
 
 void bx_local_apic_c::set_id(Bit32u new_id)
diff --git a/bochs/cpu/init.cc b/bochs/cpu/init.cc
index 22a8859ce..9849f52a5 100644
--- a/bochs/cpu/init.cc
+++ b/bochs/cpu/init.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: init.cc,v 1.199 2009-02-17 19:20:47 sshwarts Exp $
+// $Id: init.cc,v 1.200 2009-02-18 22:33:06 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -927,6 +927,7 @@ void BX_CPU_C::reset(unsigned source)
   /* APIC Address, APIC enabled and BSP is default, we'll fill in the rest later */
   BX_CPU_THIS_PTR msr.apicbase = BX_LAPIC_BASE_ADDR;
   BX_CPU_THIS_PTR lapic.init();
+  BX_CPU_THIS_PTR lapic.set_base(BX_CPU_THIS_PTR msr.apicbase);
   BX_CPU_THIS_PTR msr.apicbase |= 0x900;
 #endif
 #if BX_SUPPORT_X86_64
diff --git a/bochs/cpu/proc_ctrl.cc b/bochs/cpu/proc_ctrl.cc
index 2789842a0..7712fa41e 100644
--- a/bochs/cpu/proc_ctrl.cc
+++ b/bochs/cpu/proc_ctrl.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: proc_ctrl.cc,v 1.287 2009-02-17 19:20:47 sshwarts Exp $
+// $Id: proc_ctrl.cc,v 1.288 2009-02-18 22:33:06 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -350,10 +350,12 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::MOV_DdRd(bxInstruction_c *i)
       // Even bits 11,10 are changeable though reserved.
       BX_CPU_THIS_PTR dr7 = (val_32 & 0xffff2fff) | 0x00000400;
 #endif
+#if BX_X86_DEBUGGER
       // if we have breakpoints enabled then we must check
       // breakpoints condition in cpu loop
       if(BX_CPU_THIS_PTR dr7 & 0xff)
         BX_CPU_THIS_PTR async_event = 1;
+#endif
       break;
 
     default:
@@ -522,10 +524,12 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::MOV_DqRq(bxInstruction_c *i)
       // Even bits 11,10 are changeable though reserved.
       BX_CPU_THIS_PTR dr7 = (val_64 & 0xffff2fff) | 0x00000400;
 
+#if BX_X86_DEBUGGER
       // if we have breakpoints enabled then we must check
       // breakpoints condition in cpu loop
       if(BX_CPU_THIS_PTR dr7 & 0xff)
         BX_CPU_THIS_PTR async_event = 1;
+#endif
       break;
 
     default: