diff --git a/src/chipset/intel_piix.c b/src/chipset/intel_piix.c
index d36109ffd..bff891bea 100644
--- a/src/chipset/intel_piix.c
+++ b/src/chipset/intel_piix.c
@@ -303,10 +303,10 @@ piix_trap_update_devctl(piix_t *dev, uint8_t trap_id, uint8_t dev_id,
 	trap->en_mask = devctl_mask;
     }
 
-//#ifdef ENABLE_PIIX_LOG
+#ifdef ENABLE_PIIX_LOG
     if ((dev_id == 9) || (dev_id == 10) || (dev_id == 12) || (dev_id == 13))
-	pclog("PIIX: Mapping trap device %d to %04X-%04X (enable %d)\n", dev_id, addr, addr + size - 1, enable);
-//#endif
+	piix_log("PIIX: Mapping trap device %d to %04X-%04X (enable %d)\n", dev_id, addr, addr + size - 1, enable);
+#endif
 
     /* Remap I/O trap. */
     io_trap_remap(trap->trap, enable, addr, size);
diff --git a/src/io.c b/src/io.c
index 0d3d1bb91..d704a036a 100644
--- a/src/io.c
+++ b/src/io.c
@@ -666,7 +666,7 @@ io_trap_remap(void *handle, int enable, uint16_t addr, uint16_t size)
 	return;
 
     io_log("I/O: Remapping trap from %04X-%04X (enable %d) to %04X-%04X (enable %d)\n",
-	   trap->base, trap->base + trap->size, trap->enable, addr, addr + size, enable);
+	   trap->base, trap->base + trap->size - 1, trap->enable, addr, addr + size - 1, enable);
 
     /* Remove old I/O mapping. */
     if (trap->enable && trap->base && trap->size) {