diff --git a/scripts/git_backup.sh b/scripts/git_backup.sh
index ba66e44..002ee87 100755
--- a/scripts/git_backup.sh
+++ b/scripts/git_backup.sh
@@ -60,10 +60,8 @@ function remove_git_backup(){
     case "${yn}" in
       Y|y)
         echo -e "${white}"
-        echo -e "Info: Stopping processes..."
-        pkill git-backup.sh
-        pkill Git-Backup
-        pkill inotifywait
+        echo -e "Info: Stopping services..."
+        /etc/init.d/S52Git-Backup stop
         echo -e "Info: Removing files..."
         rm -f "$HS_CONFIG_FOLDER"/git-backup.cfg
         rm -f "$INITD_FOLDER"/S52Git-Backup
diff --git a/scripts/guppyflo.sh b/scripts/guppyflo.sh
index f00b3f6..d73a660 100755
--- a/scripts/guppyflo.sh
+++ b/scripts/guppyflo.sh
@@ -25,6 +25,9 @@ function install_guppyflo(){
           echo -e "Info: Stopping GuppyFLO service..."
           /etc/init.d/S99guppyflo stop &> /dev/null
         fi
+        if [ -f "$GUPPYFLO_FOLDER"/guppytunnel.json ]; then
+          mv "$GUPPYFLO_FOLDER"/guppytunnel.json "$USR_DATA"/guppytunnel.json
+        fi
         if [ -d "$GUPPYFLO_FOLDER" ]; then
           rm -rf "$GUPPYFLO_FOLDER"
         fi
@@ -48,6 +51,9 @@ function install_guppyflo(){
         ln -sf "$GUPPYFLO_FOLDER"/services/S99guppyflo "$INITD_FOLDER"/S99guppyflo
         ln -sf "$GUPPYFLO_FOLDER"/services/respawn/libeinfo.so.1 /lib/libeinfo.so.1
         ln -sf "$GUPPYFLO_FOLDER"/services/respawn/librc.so.1 /lib/librc.so.1
+        if [ -f "$USR_DATA"/guppytunnel.json ]; then
+          mv "$USR_DATA"/guppytunnel.json "$GUPPYFLO_FOLDER"/guppytunnel.json
+        fi
         echo -e "Info: Starting GuppyFLO service..."
         /etc/init.d/S99guppyflo start &> /dev/null
         ok_msg "GuppyFLO has been installed successfully!"