diff --git a/src/x9d/hal.h b/src/x9d/hal.h
index 684a7c3b9..b2d3b8b1d 100644
--- a/src/x9d/hal.h
+++ b/src/x9d/hal.h
@@ -52,10 +52,10 @@
 #define	PIN_SW_E_H		        GPIO_Pin_4	//PB.04
 
 #if defined(REV3)
-  #define GPIO_PIN_SW_B_H               GPIOB->IDR
   #define GPIO_PIN_SW_B_L               GPIOB->IDR
-  #define PIN_SW_B_H                    GPIO_Pin_5      //PB.05
-  #define PIN_SW_B_L                    GPIO_Pin_6      //PB.06
+  #define GPIO_PIN_SW_B_H               GPIOB->IDR
+  #define PIN_SW_B_L                    GPIO_Pin_5      //PB.05
+  #define PIN_SW_B_H                    GPIO_Pin_6      //PB.06
 #else
   #define GPIO_PIN_SW_B_H               GPIOE->IDR
   #define GPIO_PIN_SW_B_L               GPIOE->IDR
@@ -65,7 +65,7 @@
 
 #if defined(REV3)
   #define GPIO_PIN_SW_A_L               GPIOB->IDR
-  #define GPIO_PIN_SW_A_H               GPIOB->IDR
+  #define GPIO_PIN_SW_A_H               GPIOE->IDR
   #define PIN_SW_A_L		        GPIO_Pin_7	//PB.07
   #define PIN_SW_A_H		        GPIO_Pin_2	//PE.02
 #else
diff --git a/src/x9d/keys_driver.cpp b/src/x9d/keys_driver.cpp
index 6f52de4e6..d2b979c60 100644
--- a/src/x9d/keys_driver.cpp
+++ b/src/x9d/keys_driver.cpp
@@ -120,8 +120,6 @@ void readKeysAndTrims()
 bool switchState(EnumKeys enuk)
 {
   register uint32_t b = GPIOB->IDR;
-  register uint32_t e = GPIOE->IDR;
-
   register uint32_t xxx = 0;
 
   if (enuk < (int) DIM(keys)) return keys[enuk].state() ? 1 : 0;