diff --git a/bootloader/Makefile b/bootloader/Makefile
index 7cc0db7b7bbd58b933e9b0b7d18b2803895b09fa..e188eecda12065a3b3b53ddd150dc8c3c2c62806 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -53,7 +53,8 @@ COMPILER=GCC
 
 # Specify the board used
 ifeq "$(BOARD)" ""
-BOARD=EvKit_V1
+#BOARD=EvKit_V1
+BOARD=card10
 endif
 
 # This is the path to the CMSIS root directory
diff --git a/sdk/Libraries/Boards/card10/Source/board.c b/sdk/Libraries/Boards/card10/Source/board.c
index 15e1e565f9f7abd3d0b0fa0a10405bacf5227952..aebe0ffa5aad2d84e9225dba947e7f0a75861159 100644
--- a/sdk/Libraries/Boards/card10/Source/board.c
+++ b/sdk/Libraries/Boards/card10/Source/board.c
@@ -103,7 +103,8 @@ int Board_Init(void)
         {PORT_0, PIN_31, GPIO_FUNC_OUT, GPIO_PAD_NONE},     // ECG switch
     };
     const unsigned int num_pins = (sizeof(pins) / sizeof(gpio_cfg_t));
-    for (int i = 0; i < num_pins; i++) {
+    int i;
+    for (i = 0; i < num_pins; i++) {
         GPIO_OutClr(&pins[i]);
         GPIO_Config(&pins[i]);
     }
diff --git a/testapp/Makefile b/testapp/Makefile
index ff77fa6530aaeb70b4dd539c54d925fc4f252a23..02f653b559af84af609ee7bfed6e13f88bc9ff43 100644
--- a/testapp/Makefile
+++ b/testapp/Makefile
@@ -53,7 +53,8 @@ COMPILER=GCC
 
 # Specify the board used
 ifeq "$(BOARD)" ""
-BOARD=EvKit_V1
+#BOARD=EvKit_V1
+BOARD=card10
 endif
 
 # This is the path to the CMSIS root directory