diff --git a/src/chipset/intel_420ex.c b/src/chipset/intel_420ex.c
index 64fd8a6ab..9ab21e449 100644
--- a/src/chipset/intel_420ex.c
+++ b/src/chipset/intel_420ex.c
@@ -166,13 +166,12 @@ static void
 i420ex_drb_recalc(i420ex_t *dev)
 {
     int i;
-    uint32_t boundary, shift;
+    uint32_t boundary;
 
     for (i = 4; i >= 0; i--)
         row_disable(i);
 
     for (i = 0; i <= 4; i++) {
-	shift = (i & 1) << 2;
 	boundary = ((uint32_t) dev->regs[0x60 + i]) & 0xff;
 	row_set_boundary(i, boundary);
     }
diff --git a/src/chipset/intel_4x0.c b/src/chipset/intel_4x0.c
index c8bc80271..0d07914b2 100644
--- a/src/chipset/intel_4x0.c
+++ b/src/chipset/intel_4x0.c
@@ -1536,11 +1536,11 @@ i4x0_reset(void *priv)
     for (uint8_t i = 0; i < 6; i++)
         i4x0_write(0, 0x5a + i, 0x00, priv);
 
-    for (i = 0; i <= dev->max_drb; i++)
+    for (uint8_t i = 0; i <= dev->max_drb; i++)
         dev->regs[0x60 + i] = dev->drb_default;
 
     if (dev->type >= INTEL_430NX) {
-        for (i = 0; i < 4; i++)
+        for (uint8_t i = 0; i < 4; i++)
             dev->regs[0x68 + i] = 0x00;
     }
 
diff --git a/src/chipset/sis_85c496.c b/src/chipset/sis_85c496.c
index 6d1695108..106d5f793 100644
--- a/src/chipset/sis_85c496.c
+++ b/src/chipset/sis_85c496.c
@@ -40,7 +40,7 @@
 #include <86box/spd.h>
 #ifndef USE_DRB_HACK
 #include <86box/row.h>
-#endi
+#endif
 
 typedef struct sis_85c496_t {
     uint8_t    cur_reg;
@@ -196,13 +196,12 @@ static void
 sis_85c496_drb_recalc(sis_85c496_t *dev)
 {
     int i;
-    uint32_t boundary, shift;
+    uint32_t boundary;
 
     for (i = 7; i >= 0; i--)
         row_disable(i);
 
     for (i = 0; i <= 7; i++) {
-        shift = (i & 1) << 2;
         boundary = ((uint32_t) dev->pci_conf[0x48 + i]);
         row_set_boundary(i, boundary);
     }