diff --git a/Apps/System/testapp.c b/Apps/System/testapp.c
index cc251a7f..a6e5d696 100644
--- a/Apps/System/testapp.c
+++ b/Apps/System/testapp.c
@@ -14,7 +14,7 @@
 
 static Window *s_main_window;
 static Menu *s_menu;
-StatusBarLayer *status_bar;
+static StatusBarLayer *status_bar;
 
 static void testapp_exec_window_unload(Window *window);
 static void _reset_menu_items(void);
diff --git a/Apps/System/widgettest.c b/Apps/System/widgettest.c
index a3ce1cb6..4361a682 100644
--- a/Apps/System/widgettest.c
+++ b/Apps/System/widgettest.c
@@ -18,7 +18,7 @@ const char * const test_name = "Test";
 static Window *s_main_window;
 
 ActionBarLayer *action_bar;
-StatusBarLayer *status_bar;
+static StatusBarLayer *status_bar;
 
 typedef struct {
     uint8_t hours;
diff --git a/Utilities/stm32_crc.py b/Utilities/stm32_crc.py
index 1c0bd08d..ad8119aa 100644
--- a/Utilities/stm32_crc.py
+++ b/Utilities/stm32_crc.py
@@ -9,7 +9,10 @@ def process_word(data, crc=0xffffffff):
         for x in range(0, 4 - len(data)):
             d_array.insert(0,0)
         d_array.reverse()
-        data = d_array.tostring()
+        try:
+            data = d_array.tobytes()
+        except:
+            data = d_array.tostring()
 
     d = array.array('I', data)[0]
     crc = crc ^ d