diff --git a/src/chipset/via_pipc.c b/src/chipset/via_pipc.c
index f58966e0b..7e4a0835c 100644
--- a/src/chipset/via_pipc.c
+++ b/src/chipset/via_pipc.c
@@ -202,15 +202,12 @@ pipc_reset_hard(void *priv)
 	switch (dev->local) {
 		case VIA_PIPC_586A:
 		case VIA_PIPC_586B:
+		case VIA_PIPC_596A:
 			dev->usb_regs[i][0x08] = 0x02;
 			break;
 
-		case VIA_PIPC_596A:
-			dev->usb_regs[i][0x08] = 0x08;
-			break;
-
 		case VIA_PIPC_596B:
-			dev->usb_regs[i][0x08] = 0x11;
+			dev->usb_regs[i][0x08] = 0x08;
 			break;
 
 		case VIA_PIPC_686A:
@@ -218,7 +215,7 @@ pipc_reset_hard(void *priv)
 			break;
 
 		case VIA_PIPC_686B:
-			dev->usb_regs[i][0x08] = 0x16;
+			dev->usb_regs[i][0x08] = 0x1a;
 			break;
 	}
 
diff --git a/src/device/clock_ics9xxx.c b/src/device/clock_ics9xxx.c
index a6049c0dd..8d4d467c4 100644
--- a/src/device/clock_ics9xxx.c
+++ b/src/device/clock_ics9xxx.c
@@ -915,7 +915,7 @@ static const ics9xxx_model_t ics9xxx_models[] = {
 #ifdef ENABLE_ICS9xxx_DETECT
 static uint16_t	detect_bus = 0;
 static uint8_t	detect_reg = 0;
-static uint8_t	discarded[sizeof(ics9xxx_models) / sizeof(ics9xxx_models[0])] = {0};
+static uint8_t	discarded[ICS9xxx_MAX] = {0};
 
 
 static void