diff --git a/.gitignore b/.gitignore
index 56b58f5..4703478 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *~
 *#
+.#*
 GPATH
 GRTAGS
 GTAGS
@@ -8,3 +9,4 @@ firmware
 .gdb_history
 local.mk
 local.h
+screenlog.*
diff --git a/core/include/common_macros.h b/core/include/common_macros.h
index 74956af..fa13ff9 100644
--- a/core/include/common_macros.h
+++ b/core/include/common_macros.h
@@ -13,7 +13,7 @@
 #define UNUSED __attributed((unused))
 
 #ifndef BIT
-#define BIT(X) (1<<X)
+#define BIT(X) (1<<(X))
 #endif
 
 /* Use this macro to store constant values in IROM flash instead
diff --git a/core/include/esp/gpio.h b/core/include/esp/gpio.h
index e0b87a0..3ad8ded 100644
--- a/core/include/esp/gpio.h
+++ b/core/include/esp/gpio.h
@@ -7,6 +7,7 @@
  * BSD Licensed as described in the file LICENSE
  */
 #ifndef _ESP_GPIO_H
+#define _ESP_GPIO_H
 #include <stdbool.h>
 #include "esp/registers.h"
 #include "esp/iomux.h"