diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cf86fb916..aab3ff353 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -36,6 +36,7 @@
 /applications/services/power_settings_app/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich
 
 /applications/system/storage_move_to_sd/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
+/applications/system/js_app/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
 
 /applications/debug/unit_tests/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov @gornekich @Astrrra @Skorpionm
 
@@ -58,7 +59,7 @@
 /lib/lfrfid/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
 /lib/libusb_stm32/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
 /lib/mbedtls/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
-/lib/micro-ecc/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
+/lib/mjs/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
 /lib/nanopb/ @skotopes @DrZlo13 @hedger @gsurkov @nminaylov
 /lib/nfc/ @skotopes @DrZlo13 @hedger @gsurkov @gornekich @Astrrra
 /lib/one_wire/ @skotopes @DrZlo13 @hedger @gsurkov
diff --git a/applications/ReadMe.md b/applications/ReadMe.md
index de465832a..44bd8c5d7 100644
--- a/applications/ReadMe.md
+++ b/applications/ReadMe.md
@@ -72,7 +72,10 @@ Small applications providing configuration for basic firmware and its services.
 
 ## system
 
-Utility apps not visible in other menus.
+Utility apps not visible in other menus, plus few external apps pre-packaged with the firmware.
 
+- `hid_app`             - BLE & USB HID remote
+- `js_app`              - JS engine runner
+- `snake_game`          - Snake game
 - `storage_move_to_sd`  - Data migration tool for internal storage
 - `updater`             - Update service & application
diff --git a/applications/system/js_app/examples/apps/Scripts/load.js b/applications/system/js_app/examples/apps/Scripts/load.js
index 59d99b94c..dfb110ca5 100644
--- a/applications/system/js_app/examples/apps/Scripts/load.js
+++ b/applications/system/js_app/examples/apps/Scripts/load.js
@@ -1,3 +1,3 @@
-let math = load("/ext/apps/Scripts/api.js");
+let math = load("/ext/apps/Scripts/load_api.js");
 let result = math.add(5, 10);
 print(result);
\ No newline at end of file
diff --git a/applications/system/js_app/plugin_api/app_api_table_i.h b/applications/system/js_app/plugin_api/app_api_table_i.h
index 8f1ebd5f4..d84ae8110 100644
--- a/applications/system/js_app/plugin_api/app_api_table_i.h
+++ b/applications/system/js_app/plugin_api/app_api_table_i.h
@@ -8,6 +8,4 @@
 static constexpr auto app_api_table = sort(create_array_t<sym_entry>(
     API_METHOD(js_delay_with_flags, bool, (struct mjs*, uint32_t)),
     API_METHOD(js_flags_set, void, (struct mjs*, uint32_t)),
-    API_METHOD(js_flags_wait, uint32_t, (struct mjs*, uint32_t, uint32_t)),
-    API_VARIABLE(I_Certification1_103x56, const Icon),
-    API_VARIABLE(I_Certification2_46x33, const Icon)));
\ No newline at end of file
+    API_METHOD(js_flags_wait, uint32_t, (struct mjs*, uint32_t, uint32_t))));
diff --git a/lib/mjs/SConscript b/lib/mjs/SConscript
index 35b45fc91..ddfa91f62 100644
--- a/lib/mjs/SConscript
+++ b/lib/mjs/SConscript
@@ -21,9 +21,6 @@ libenv.ApplyLibFlags()
 
 libenv.AppendUnique(
     CCFLAGS=[
-        # Required for lib to be linkable with .faps
-        "-mword-relocations",
-        "-mlong-calls",
         "-Wno-redundant-decls",
         "-Wno-unused-function",
     ],