diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
index 6ec67cea..e553aa87 100644
--- a/src/displayapp/DisplayAppRecovery.cpp
+++ b/src/displayapp/DisplayAppRecovery.cpp
@@ -2,7 +2,7 @@
 #include <FreeRTOS.h>
 #include <task.h>
 #include <libraries/log/nrf_log.h>
-#include <components/fs/FS.h>
+#include "components/fs/FS.h"
 #include "components/rle/RleDecoder.h"
 #include "touchhandler/TouchHandler.h"
 #include "displayapp/icons/infinitime/infinitime-nb.c"
diff --git a/src/displayapp/screens/CheckboxList.cpp b/src/displayapp/screens/CheckboxList.cpp
index 177a9718..d351a852 100644
--- a/src/displayapp/screens/CheckboxList.cpp
+++ b/src/displayapp/screens/CheckboxList.cpp
@@ -20,7 +20,7 @@ CheckboxList::CheckboxList(const uint8_t screenID,
                            const char* optionsSymbol,
                            void (Controllers::Settings::*SetOptionIndex)(uint8_t),
                            uint8_t (Controllers::Settings::*GetOptionIndex)() const,
-                           std::array<const char*, MAXLISTITEMS> options)
+                           std::array<const char*, MaxItems> options)
   : Screen(app),
     screenID {screenID},
     settingsController {settingsController},
@@ -42,7 +42,7 @@ CheckboxList::CheckboxList(const uint8_t screenID,
     pageIndicatorBase = lv_line_create(lv_scr_act(), NULL);
     lv_obj_set_style_local_line_width(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
     lv_obj_set_style_local_line_color(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-    lv_line_set_points(pageIndicatorBase, pageIndicatorBasePoints, 2);
+    lv_line_set_points(pageIndicatorBase, pageIndicatorBasePoints.data(), 2);
 
     const uint16_t indicatorSize = LV_VER_RES / numScreens;
     const uint16_t indicatorPos = indicatorSize * screenID;
@@ -55,7 +55,7 @@ CheckboxList::CheckboxList(const uint8_t screenID,
     pageIndicator = lv_line_create(lv_scr_act(), NULL);
     lv_obj_set_style_local_line_width(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
     lv_obj_set_style_local_line_color(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
-    lv_line_set_points(pageIndicator, pageIndicatorPoints, 2);
+    lv_line_set_points(pageIndicator, pageIndicatorPoints.data(), 2);
   }
 
   lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
diff --git a/src/displayapp/screens/CheckboxList.h b/src/displayapp/screens/CheckboxList.h
index 6660acde..68280edd 100644
--- a/src/displayapp/screens/CheckboxList.h
+++ b/src/displayapp/screens/CheckboxList.h
@@ -14,6 +14,8 @@ namespace Pinetime {
     namespace Screens {
       class CheckboxList : public Screen {
       public:
+        static constexpr size_t MaxItems = 4;
+
         CheckboxList(const uint8_t screenID,
                      const uint8_t numScreens,
                      DisplayApp* app,
@@ -22,7 +24,7 @@ namespace Pinetime {
                      const char* optionsSymbol,
                      void (Controllers::Settings::*SetOptionIndex)(uint8_t),
                      uint8_t (Controllers::Settings::*GetOptionIndex)() const,
-                     std::array<const char*, MAXLISTITEMS> options);
+                     std::array<const char*, MaxItems> options);
 
         ~CheckboxList() override;
 
@@ -35,12 +37,10 @@ namespace Pinetime {
         const char* optionsSymbol;
         void (Controllers::Settings::*SetOptionIndex)(uint8_t);
         uint8_t (Controllers::Settings::*GetOptionIndex)() const;
-        std::array<const char*, MAXLISTITEMS> options;
-
-        lv_obj_t* cbOption[MAXLISTITEMS];
-
-        lv_point_t pageIndicatorBasePoints[2];
-        lv_point_t pageIndicatorPoints[2];
+        std::array<const char*, MaxItems> options;
+        std::array<lv_obj_t*, MaxItems> cbOption;
+        std::array<lv_point_t, 2> pageIndicatorBasePoints;
+        std::array<lv_point_t, 2> pageIndicatorPoints;
         lv_obj_t* pageIndicatorBase;
         lv_obj_t* pageIndicator;
       };
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 90b65ebd..443506e0 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -24,7 +24,7 @@ Clock::Clock(DisplayApp* app,
              Controllers::Settings& settingsController,
              Controllers::HeartRateController& heartRateController,
              Controllers::MotionController& motionController,
-             Controllers::FS& fs)
+             Controllers::FS& filesystem)
   : Screen(app),
     dateTimeController {dateTimeController},
     batteryController {batteryController},
@@ -33,7 +33,7 @@ Clock::Clock(DisplayApp* app,
     settingsController {settingsController},
     heartRateController {heartRateController},
     motionController {motionController},
-    fs {fs},
+    filesystem {filesystem},
     screen {[this, &settingsController]() {
       switch (settingsController.GetClockFace()) {
         case 0:
@@ -118,5 +118,5 @@ std::unique_ptr<Screen> Clock::WatchFaceInfineatScreen() {
                                                       notificatioManager,
                                                       settingsController,
                                                       motionController,
-                                                      fs);
+                                                      filesystem);
 }
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 0cdc6028..b48c9ba2 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -29,7 +29,7 @@ namespace Pinetime {
               Controllers::Settings& settingsController,
               Controllers::HeartRateController& heartRateController,
               Controllers::MotionController& motionController,
-              Controllers::FS& fs);
+              Controllers::FS& filesystem);
         ~Clock() override;
 
         bool OnTouchEvent(TouchEvents event) override;
@@ -43,7 +43,7 @@ namespace Pinetime {
         Controllers::Settings& settingsController;
         Controllers::HeartRateController& heartRateController;
         Controllers::MotionController& motionController;
-        Controllers::FS& fs;
+        Controllers::FS& filesystem;
 
         std::unique_ptr<Screen> screen;
         std::unique_ptr<Screen> WatchFaceDigitalScreen();
diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h
index c306b53c..4a7dbebd 100644
--- a/src/displayapp/screens/WatchFaceInfineat.h
+++ b/src/displayapp/screens/WatchFaceInfineat.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <lvgl/src/lv_core/lv_obj.h>
+#include <lvgl/lvgl.h>
 #include <chrono>
 #include <cstdint>
 #include <memory>