diff --git a/applications/infrared/infrared_cli.c b/applications/infrared/infrared_cli.c
index 1b3ec4b3..d88e7fff 100644
--- a/applications/infrared/infrared_cli.c
+++ b/applications/infrared/infrared_cli.c
@@ -97,6 +97,7 @@ static bool infrared_cli_parse_message(const char* str, InfraredSignal* signal)
         return false;
     }
 
+    message.protocol = infrared_get_protocol_by_name(protocol_name);
     message.repeat = false;
     infrared_signal_set_message(signal, &message);
     return infrared_signal_is_valid(signal);
diff --git a/firmware.scons b/firmware.scons
index 3652c298..890be5f8 100644
--- a/firmware.scons
+++ b/firmware.scons
@@ -39,7 +39,17 @@ env = ENV.Clone(
             ],
             # You can add other entries named after libraries
             # If they are present, they have precedence over Default
-        }
+        },
+        # for furi_check to respect build type
+        "core": {
+            "CCFLAGS": [
+                "-Os",
+            ],
+            "CPPDEFINES": [
+                "NDEBUG",
+                "FURI_DEBUG" if ENV["DEBUG"] else "FURI_NDEBUG",
+            ],
+        },
     },
 )
 
@@ -191,6 +201,7 @@ fwelf = fwenv["FW_ELF"] = fwenv.Program(
 # Make it depend on everything child builders returned
 Depends(fwelf, lib_targets)
 AddPostAction(fwelf, fwenv["APPBUILD_DUMP"])
+AddPostAction(fwelf, Action("@$SIZECOM"))
 
 
 fwhex = fwenv["FW_HEX"] = fwenv.HEXBuilder("${FIRMWARE_BUILD_CFG}")
diff --git a/site_scons/site_tools/crosscc.py b/site_scons/site_tools/crosscc.py
index 0770df71..8d6b4a61 100644
--- a/site_scons/site_tools/crosscc.py
+++ b/site_scons/site_tools/crosscc.py
@@ -6,6 +6,7 @@ from SCons.Tool import gnulink
 import strip
 import gdb
 import objdump
+import size
 
 from SCons.Action import _subproc
 import subprocess
@@ -36,7 +37,7 @@ def _get_tool_version(env, tool):
 
 
 def generate(env, **kw):
-    for orig_tool in (asm, gcc, gxx, ar, gnulink, strip, gdb, objdump):
+    for orig_tool in (asm, gcc, gxx, ar, gnulink, strip, gdb, objdump, size):
         orig_tool.generate(env)
     env.SetDefault(
         TOOLCHAIN_PREFIX=kw.get("toolchain_prefix"),
@@ -55,6 +56,7 @@ def generate(env, **kw):
             "GDB",
             "GDBPY",
             "OBJDUMP",
+            "SIZE",
         ],
     )
     # Call CC to check version
diff --git a/site_scons/site_tools/fbt_dist.py b/site_scons/site_tools/fbt_dist.py
index c39f7242..8fad2156 100644
--- a/site_scons/site_tools/fbt_dist.py
+++ b/site_scons/site_tools/fbt_dist.py
@@ -77,8 +77,7 @@ def generate(env):
         BUILDERS={
             "DistBuilder": Builder(
                 action=Action(
-                    '${PYTHON3} ${ROOT_DIR.abspath}/scripts/sconsdist.py copy -p ${DIST_PROJECTS} -s "${DIST_SUFFIX}" ${DIST_EXTRA}',
-                    "${DISTCOMSTR}",
+                    '@${PYTHON3} ${ROOT_DIR.abspath}/scripts/sconsdist.py copy -p ${DIST_PROJECTS} -s "${DIST_SUFFIX}" ${DIST_EXTRA}',
                 ),
             ),
             "CoproBuilder": Builder(
diff --git a/site_scons/site_tools/size.py b/site_scons/site_tools/size.py
new file mode 100644
index 00000000..56d4f3c9
--- /dev/null
+++ b/site_scons/site_tools/size.py
@@ -0,0 +1,24 @@
+from SCons.Builder import Builder
+from SCons.Action import Action
+
+
+def generate(env):
+    env.SetDefault(
+        SIZE="size",
+        SIZEFLAGS=[],
+        SIZECOM="$SIZE $SIZEFLAGS $TARGETS",
+    )
+    env.Append(
+        BUILDERS={
+            "ELFSize": Builder(
+                action=Action(
+                    "${SIZECOM}",
+                    "${SIZECOMSTR}",
+                ),
+            ),
+        }
+    )
+
+
+def exists(env):
+    return True