diff --git a/bochs/iodev/display/vgacore.cc b/bochs/iodev/display/vgacore.cc
index e73e3bf29..766997502 100644
--- a/bochs/iodev/display/vgacore.cc
+++ b/bochs/iodev/display/vgacore.cc
@@ -361,7 +361,7 @@ void bx_vgacore_c::register_state(bx_list_c *parent)
   new bx_shadow_num_c(list, "last_bpp", &BX_VGA_THIS s.last_bpp);
   new bx_shadow_num_c(list, "last_fw", &BX_VGA_THIS s.last_fw);
   new bx_shadow_num_c(list, "last_fh", &BX_VGA_THIS s.last_fh);
-  new bx_shadow_num_c(list, "vga_override", &BX_VGA_THIS s.vga_override);
+  new bx_shadow_bool_c(list, "vga_override", &BX_VGA_THIS s.vga_override);
   new bx_shadow_data_c(list, "memory", BX_VGA_THIS s.memory, BX_VGA_THIS s.memsize);
 }
 
@@ -1807,7 +1807,6 @@ Bit8u bx_vgacore_c::mem_read(bx_phy_address addr)
       BX_VGA_THIS s.graphics_ctrl.latch[2] = plane2[offset];
       BX_VGA_THIS s.graphics_ctrl.latch[3] = plane3[offset];
       return(BX_VGA_THIS s.graphics_ctrl.latch[BX_VGA_THIS s.graphics_ctrl.read_map_select]);
-      break;
 
     case 1: /* read mode 1 */
       {
@@ -1835,7 +1834,6 @@ Bit8u bx_vgacore_c::mem_read(bx_phy_address addr)
 
       return retval;
       }
-      break;
     default:
       return 0;
   }
@@ -2357,8 +2355,7 @@ void bx_vgacore_c::debug_dump(void)
 }
 #endif
 
-void bx_vgacore_c::redraw_area(unsigned x0, unsigned y0, unsigned width,
-                      unsigned height)
+void bx_vgacore_c::redraw_area(unsigned x0, unsigned y0, unsigned width, unsigned height)
 {
   unsigned xti, yti, xt0, xt1, yt0, yt1, xmax, ymax;
 
diff --git a/bochs/iodev/display/vgacore.h b/bochs/iodev/display/vgacore.h
index 66c83fff0..874b5551c 100644
--- a/bochs/iodev/display/vgacore.h
+++ b/bochs/iodev/display/vgacore.h
@@ -168,7 +168,7 @@ protected:
       Bit8u   raster_op;
       Bit8u   read_map_select;
       Bit8u   write_mode;
-      bx_bool read_mode;
+      Bit32u  read_mode;
       bx_bool odd_even;
       bx_bool chain_odd_even;
       Bit8u   shift_reg;
diff --git a/bochs/iodev/harddrv.cc b/bochs/iodev/harddrv.cc
index e4bad3146..677bcffb4 100644
--- a/bochs/iodev/harddrv.cc
+++ b/bochs/iodev/harddrv.cc
@@ -608,7 +608,7 @@ void bx_hard_drive_c::register_state(void)
         new bx_shadow_num_c(drive, "current_command", &BX_CONTROLLER(i, j).current_command, BASE_HEX);
         new bx_shadow_num_c(drive, "multiple_sectors", &BX_CONTROLLER(i, j).multiple_sectors, BASE_HEX);
         new bx_shadow_bool_c(drive, "lba_mode", &BX_CONTROLLER(i, j).lba_mode);
-        new bx_shadow_num_c(drive, "packet_dma", &BX_CONTROLLER(i, j).packet_dma, BASE_HEX);
+        new bx_shadow_bool_c(drive, "packet_dma", &BX_CONTROLLER(i, j).packet_dma);
         new bx_shadow_bool_c(drive, "control_reset", &BX_CONTROLLER(i, j).control.reset);
         new bx_shadow_bool_c(drive, "control_disable_irq", &BX_CONTROLLER(i, j).control.disable_irq);
         new bx_shadow_num_c(drive, "reset_in_progress", &BX_CONTROLLER(i, j).reset_in_progress, BASE_HEX);
diff --git a/bochs/iodev/iodev.h b/bochs/iodev/iodev.h
index 7e635b215..03aafd419 100644
--- a/bochs/iodev/iodev.h
+++ b/bochs/iodev/iodev.h
@@ -148,23 +148,19 @@ public:
   virtual void reset(unsigned type) {
     STUBFUNC(HD, reset);
   }
+
   virtual Bit32u get_first_cd_handle(void) {
     return BX_MAX_ATA_CHANNEL*2;
   }
-  virtual unsigned get_cd_media_status(Bit32u handle) {
-    return 0;
-  }
-  virtual unsigned set_cd_media_status(Bit32u handle, unsigned status) {
+
+  virtual bx_bool  get_cd_media_status(Bit32u handle) { return 0; }
+  virtual bx_bool  set_cd_media_status(Bit32u handle, bx_bool status) {
     STUBFUNC(HD, set_cd_media_status); return 0;
   }
-  virtual Bit32u virt_read_handler(Bit32u address, unsigned io_len)
-  {
-    return 0;
-  }
-  virtual void virt_write_handler(Bit32u address,
-      Bit32u value, unsigned io_len)
-  {
-  }
+
+  virtual Bit32u virt_read_handler(Bit32u address, unsigned io_len) { return 0; }
+  virtual void virt_write_handler(Bit32u address, Bit32u value, unsigned io_len) {}
+
   virtual bx_bool bmdma_read_sector(Bit8u channel, Bit8u *buffer, Bit32u *sector_size) {
     STUBFUNC(HD, bmdma_read_sector); return 0;
   }