diff --git a/src/battery.c b/src/battery.c
index e10315e572..f7d5f21415 100644
--- a/src/battery.c
+++ b/src/battery.c
@@ -59,8 +59,8 @@ void batteryInit(batteryConfig_t *initialBatteryConfig)
 
     voltage = batteryAdcToVoltage((uint16_t)(voltage / 32));
 
-    // autodetect cell count, going from 2S..6S
-    for (i = 1; i < 6; i++) {
+    // autodetect cell count, going from 2S..8S
+    for (i = 1; i < 8; i++) {
         if (voltage < i * batteryConfig->vbatmaxcellvoltage)
             break;
     }
diff --git a/src/drivers/bus_i2c_stm32f10x.c b/src/drivers/bus_i2c_stm32f10x.c
index 4aa490a632..1e9f61b979 100755
--- a/src/drivers/bus_i2c_stm32f10x.c
+++ b/src/drivers/bus_i2c_stm32f10x.c
@@ -290,7 +290,7 @@ void i2cInit(I2C_TypeDef *I2C)
     I2C_Cmd(I2Cx, ENABLE);
     I2C_Init(I2Cx, &I2C_InitStructure);
 
-    NVIC_PriorityGroupConfig(0x500);
+    NVIC_PriorityGroupConfig(NVIC_PriorityGroup_2);
 
     // I2C ER Interrupt
     NVIC_InitStructure.NVIC_IRQChannel = I2C2_ER_IRQn;
diff --git a/src/drivers/timer_common.c b/src/drivers/timer_common.c
index 2f6b1629ed..cec19f584b 100644
--- a/src/drivers/timer_common.c
+++ b/src/drivers/timer_common.c
@@ -215,7 +215,7 @@ void timerNVICConfigure(uint8_t irq)
     NVIC_InitTypeDef NVIC_InitStructure;
 
     NVIC_InitStructure.NVIC_IRQChannel = irq;
-    NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
+    NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 1;
     NVIC_InitStructure.NVIC_IRQChannelSubPriority = 1;
     NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
     NVIC_Init(&NVIC_InitStructure);