diff --git a/firmware.scons b/firmware.scons
index d28309d0e..5219a2f3b 100644
--- a/firmware.scons
+++ b/firmware.scons
@@ -329,7 +329,7 @@ if fwenv["IS_BASE_FIRMWARE"]:
     # AlwaysBuild(sdk_tree)
     Alias("sdk_tree", sdk_tree)
 
-    sdk_apicheck = fwenv.SDKSymUpdater(fwenv.subst("$SDK_DEFINITION"), "sdk_origin")
+    sdk_apicheck = fwenv.SDKSymUpdater(fwenv["SDK_DEFINITION"], "sdk_origin")
     Precious(sdk_apicheck)
     NoClean(sdk_apicheck)
     AlwaysBuild(sdk_apicheck)
diff --git a/firmware/SConscript b/firmware/SConscript
index eee2f1151..d6715f124 100644
--- a/firmware/SConscript
+++ b/firmware/SConscript
@@ -10,8 +10,10 @@ env.Append(
         File("#/firmware/targets/furi_hal_include/furi_hal_subghz.h"),
     ],
 )
-env.SetDefault(SDK_DEFINITION=env.File("./targets/f${TARGET_HW}/api_symbols.csv"))
 
+env.SetDefault(
+    SDK_DEFINITION=env.File("./targets/f${TARGET_HW}/api_symbols.csv").srcnode()
+)
 
 libenv = env.Clone(FW_LIB_NAME="flipper${TARGET_HW}")
 libenv.Append(
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index fdd2f9979..641accbd5 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -4042,7 +4042,7 @@ Function,+,variable_item_list_set_enter_callback,void,"VariableItemList*, Variab
 Function,+,variable_item_list_set_selected_item,void,"VariableItemList*, uint8_t"
 Function,+,variable_item_set_current_value_index,void,"VariableItem*, uint8_t"
 Function,+,variable_item_set_current_value_text,void,"VariableItem*, const char*"
-Function,-,variable_item_set_values_count,void,"VariableItem*, uint8_t"
+Function,+,variable_item_set_values_count,void,"VariableItem*, uint8_t"
 Function,-,vasiprintf,int,"char**, const char*, __gnuc_va_list"
 Function,-,vasniprintf,char*,"char*, size_t*, const char*, __gnuc_va_list"
 Function,-,vasnprintf,char*,"char*, size_t*, const char*, __gnuc_va_list"
diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
index 9f81d4145..e40a4efc2 100644
--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -145,7 +145,7 @@ def BuildAppElf(env, app):
 
 
 def prepare_app_metadata(target, source, env):
-    sdk_cache = SdkCache(env.subst("$SDK_DEFINITION"), load_version_only=True)
+    sdk_cache = SdkCache(env["SDK_DEFINITION"].path, load_version_only=True)
 
     if not sdk_cache.is_buildable():
         raise UserError(
@@ -166,7 +166,7 @@ def prepare_app_metadata(target, source, env):
 
 
 def validate_app_imports(target, source, env):
-    sdk_cache = SdkCache(env.subst("$SDK_DEFINITION"), load_version_only=False)
+    sdk_cache = SdkCache(env["SDK_DEFINITION"].path, load_version_only=False)
     app_syms = set()
     with open(target[0].path, "rt") as f:
         for line in f: