diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index a92b3199..1985d411 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -102,6 +102,7 @@ env.Replace(
     ],
 
     LINKFLAGS=[
+        "-Os",
         "-nostdlib",
         "-Wl,--no-check-sections",
         "-u", "call_user_start",
diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py
index e8bf012a..44bf2f6b 100644
--- a/platformio/builder/scripts/frameworks/arduino.py
+++ b/platformio/builder/scripts/frameworks/arduino.py
@@ -57,7 +57,7 @@ elif env.get("PLATFORM") == "espressif":
     env.Prepend(
         CPPPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "include")],
         LIBPATH=[join("$PLATFORMFW_DIR", "tools", "sdk", "lib")],
-        LIBS=["smartconfig", "pp", "main", "wpa", "lwip",
+        LIBS=["mesh", "wpa2", "smartconfig", "pp", "main", "wpa", "lwip",
               "net80211", "wps", "crypto", "phy", "hal", "axtls", "gcc", "m"]
     )
 elif env.get("PLATFORM") == "nordicnrf51":