diff --git a/applications/main/subghz/scenes/subghz_scene_radio_settings.c b/applications/main/subghz/scenes/subghz_scene_radio_settings.c
index 5ffd2f224..3b4ca47b9 100644
--- a/applications/main/subghz/scenes/subghz_scene_radio_settings.c
+++ b/applications/main/subghz/scenes/subghz_scene_radio_settings.c
@@ -154,6 +154,7 @@ static void subghz_scene_receiver_config_set_gps(VariableItem* item) {
     subghz_last_settings_save(subghz->last_settings);
 
     if(subghz->last_settings->gps_baudrate != 0) {
+        subghz_gps_stop(subghz->gps);
         subghz_gps_set_baudrate(subghz->last_settings->gps_baudrate);
         subghz_gps_start(subghz->gps);
     } else {
diff --git a/fbt b/fbt
index 26f325d45..a4f953c3d 100755
--- a/fbt
+++ b/fbt
@@ -29,7 +29,7 @@ if [ -z "$FBT_NO_SYNC" ]; then
         echo "\".git\" directory not found, please clone repo via \"git clone\"";
         exit 1;
     fi
-    git submodule update --init --jobs "$N_GIT_THREADS";
+    git submodule update --init --recursive --jobs "$N_GIT_THREADS";
 fi
 
 $SCONS_EP $SCONS_DEFAULT_FLAGS "$@"
diff --git a/fbt.cmd b/fbt.cmd
index 03e4ec3d0..61f55f5c1 100644
--- a/fbt.cmd
+++ b/fbt.cmd
@@ -5,7 +5,7 @@ set SCONS_EP=python -m SCons
 
 if [%FBT_NO_SYNC%] == [] (
     if exist ".git" (
-        git submodule update --init --depth 1 --jobs %NUMBER_OF_PROCESSORS%
+        git submodule update --init --recursive --depth 1 --jobs %NUMBER_OF_PROCESSORS%
     ) else (
         echo Not in a git repo, please clone with "git clone"
         exit /b 1