diff --git a/Software/platformio.ini b/Software/platformio.ini
index 35594ced..44b93849 100644
--- a/Software/platformio.ini
+++ b/Software/platformio.ini
@@ -41,6 +41,7 @@ build_flags =
     -D HTTPCLIENT_1_1_COMPATIBLE=0
 ;    This flag is used for Stroke Engine.
     -D DEBUG_TALKATIVE
+targets = upload, monitor
 extends = common
 platform = espressif32
 board = esp32dev
diff --git a/Software/src/extensions/u8g2Extensions.h b/Software/src/extensions/u8g2Extensions.h
index dbb3d8c0..2048f4f3 100644
--- a/Software/src/extensions/u8g2Extensions.h
+++ b/Software/src/extensions/u8g2Extensions.h
@@ -32,7 +32,7 @@ static int getUTF8CharLength(const unsigned char c) {
  * display.
  */
 namespace drawStr {
-    static void centered(int y, String str) {
+    static void centered(int y, const String& str) {
         // Convert the String object to a UTF-8 string.
         // The c_str() function ensures we're passing a null-terminated string,
         // which is required by getStrWidth().
@@ -54,7 +54,7 @@ namespace drawStr {
      * @param y
      * @param str
      */
-    static void multiLine(int x, int y, String string, int lineHeight = 12) {
+    static void multiLine(int x, int y, const String& string, int lineHeight = 12) {
         const char *str = string.c_str();
         // Set the font for the text to be displayed.
         display.setFont(Config::Font::base);
@@ -162,9 +162,9 @@ namespace drawStr {
         }
     }
 
-    static void title(String str) {
+    static void title(const String& str) {
         display.setFont(Config::Font::bold);
-        centered(8, std::move(str));
+        centered(8, str);
     }
 };
 
diff --git a/Software/src/ossm/OSSM.h b/Software/src/ossm/OSSM.h
index ecacc8c9..b42a220b 100644
--- a/Software/src/ossm/OSSM.h
+++ b/Software/src/ossm/OSSM.h
@@ -13,8 +13,8 @@
 #include "constants/Menu.h"
 #include "constants/Pins.h"
 #include "services/tasks.h"
-#include "structs/SettingPercents.h"
 #include "structs/AdvancedConfigurationSettings.h"
+#include "structs/SettingPercents.h"
 #include "utils/RecusiveMutex.h"
 #include "utils/StateLogger.h"
 #include "utils/StrokeEngineHelper.h"
@@ -112,8 +112,12 @@ class OSSM {
                 o.stepper->disableOutputs();
             };
             auto drawHelp = [](OSSM &o) { o.drawHelp(); };
-            auto drawAdvancedConfiguration = [](OSSM &o) { o.drawAdvancedConfiguration(); };
-            auto drawAdvancedConfigurationEditing = [](OSSM &o) { o.drawAdvancedConfigurationEditing(); };
+            auto drawAdvancedConfiguration = [](OSSM &o) {
+                o.drawAdvancedConfiguration();
+            };
+            auto drawAdvancedConfigurationEditing = [](OSSM &o) {
+                o.drawAdvancedConfigurationEditing();
+            };
             auto drawWiFi = [](OSSM &o) { o.drawWiFi(); };
             auto drawUpdate = [](OSSM &o) { o.drawUpdate(); };
             auto drawNoUpdate = [](OSSM &o) { o.drawNoUpdate(); };
@@ -144,8 +148,8 @@ class OSSM {
                 return o.isStrokeTooShort();
             };
 
-            auto isOption = [](Menu option) {
-                return [option](OSSM &o) { return o.menuOption == option; };
+            auto isOption = [](const Menu &option) {
+                return [&option](OSSM &o) { return o.menuOption == option; };
             };
 
             auto isPreflightSafe = [](OSSM &o) {
@@ -167,7 +171,7 @@ class OSSM {
             auto setNotHomed = [](OSSM &o) { o.isHomed = false; };
 
             return make_transition_table(
-            // clang-format off
+                // clang-format off
 
             //Always start by drawing the hello screen and then initializing settings
             *"idle"_s + done / drawHello = "initialize"_s,
@@ -278,8 +282,10 @@ class OSSM {
                                .depth = 50,
                                .pattern = StrokePatterns::SimpleStroke};
 
-    AdvancedConfigurationSettingName activeAdvancedConfigurationSetting = AdvancedConfigurationSettingName::ReadMe;
-    AdvancedConfigurationSettings advancedConfigurationSettings = AdvancedConfigurationSettings();
+    AdvancedConfigurationSettingName activeAdvancedConfigurationSetting =
+        AdvancedConfigurationSettingName::ReadMe;
+    AdvancedConfigurationSettings advancedConfigurationSettings =
+        AdvancedConfigurationSettings();
 
     unsigned long sessionStartTime = 0;
     int sessionStrokeCount = 0;
@@ -368,10 +374,13 @@ class OSSM {
 
     WiFiManager wm;
 
-    float getAdvancedSettingValue(AdvancedConfigurationSettingName settingName) {
-        for (auto& setting : advancedConfigurationSettings.settings) {
+    float getAdvancedSettingValue(
+        AdvancedConfigurationSettingName settingName) {
+        for (auto &setting : advancedConfigurationSettings.settings) {
             if (setting.name == settingName) {
-                ESP_LOGD("Initialize", "Configuring setting %s with value %f", getSettingName(setting.name).c_str(), setting.currentValue());
+                ESP_LOGD("Initialize", "Configuring setting %s with value %f",
+                         getSettingName(setting.name).c_str(),
+                         setting.currentValue());
                 return setting.currentValue();
             }
         }