diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py
index 2f14d9a4..f5f67708 100644
--- a/platformio/builder/tools/piolib.py
+++ b/platformio/builder/tools/piolib.py
@@ -287,6 +287,7 @@ class LibBuilderBase(object):
             except:  # pylint: disable=bare-except
                 incs = self.env.File(path).get_found_includes(
                     self.env, LibBuilderBase.CLASSIC_SCANNER, tuple(inc_dirs))
+            # print path, map(lambda n: n.get_abspath(), incs)
             for inc in incs:
                 if inc not in result:
                     result.append(inc)
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 6970d3a5..803b7f11 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -35,9 +35,9 @@ SRC_FILTER_DEFAULT = ["+<*>", "-<.git%s>" % sep, "-<svn%s>" % sep]
 def BuildProgram(env):
 
     def _append_pio_macros():
-        env.AppendUnique(CPPDEFINES=[
-            "PLATFORMIO={0:02d}{1:02d}{2:02d}".format(*pioversion_to_intstr())
-        ])
+        env.AppendUnique(CPPDEFINES=[(
+            "PLATFORMIO",
+            int("{0:02d}{1:02d}{2:02d}".format(*pioversion_to_intstr())))])
 
     _append_pio_macros()
 
diff --git a/platformio/managers/platform.py b/platformio/managers/platform.py
index 9c6cc007..cd79a953 100644
--- a/platformio/managers/platform.py
+++ b/platformio/managers/platform.py
@@ -477,7 +477,7 @@ class PlatformBase(PlatformPackagesMixin, PlatformRunMixin):
             }
         if "tool-scons" not in self.packages:
             self.packages['tool-scons'] = {
-                "version": "~3.20401.2",
+                "version": "~3.20401.3",
                 "optional": False
             }