diff --git a/debian/_buildscripts/local/00_extradeps.sh b/debian/_buildscripts/local/00_extradeps.sh
index a1b35d8e7..804afe4ea 100755
--- a/debian/_buildscripts/local/00_extradeps.sh
+++ b/debian/_buildscripts/local/00_extradeps.sh
@@ -9,6 +9,7 @@ if [[ "$USE_PREBUILD_EXTRA_DEPS" = "y" ]]; then
   echo -e "${CBrown}####  Use of pre-built extra dependency packages is currently configured. Nothing to do.  ####\n${CNone}"
   echo "Use of pre-built extra dependency packages is currently configured. Nothing to do." >>"$LOG_BUILD_RESULT_FILENAME"
 else
+  build_module "$CFG_EXTRA_DEPS_DIR/uncrustify-trinity"
   build_module "$CFG_EXTRA_DEPS_DIR/fireflies"
   build_module "$CFG_EXTRA_DEPS_DIR/imlib"
 #  build_module "$CFG_EXTRA_DEPS_DIR/opensync"   # deprecated - no longer required in R14.1 series. To remove in R14.2.0
diff --git a/debian/_buildscripts/local/build_module.sh b/debian/_buildscripts/local/build_module.sh
index 6799e2fa7..30d0facd6 100755
--- a/debian/_buildscripts/local/build_module.sh
+++ b/debian/_buildscripts/local/build_module.sh
@@ -377,7 +377,7 @@ MOD_UP_VER=`head -n 1 "$MOD_BUILD_PKGING_PATH/changelog" | sed -r "s/^[^ ]+ \(([
 MOD_DEB_VER=`head -n 1 "$MOD_BUILD_PKGING_PATH/changelog" | sed -r "s/^[^ ]+ \(.*+-([^\)]+).*/\1/"`
 
 REPO_DATE=`dpkg-parsechangelog -l "$MOD_BUILD_PKGING_PATH/changelog" | sed -n -e 's|^Date: ||p'`
-tar cJf "../${MOD_BASENAME}_${MOD_UP_VER}.orig.tar.xz" --exclude="debian" --exclude=".git*" \
+tar cJf "../${MOD_BASENAME}_${MOD_UP_VER}.orig.tar.xz" --exclude="debian" --exclude .git --exclude .gitmodules \
       --mtime "$REPO_DATE" --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime .
 touch -d "$REPO_DATE" "../${MOD_BASENAME}_${MOD_UP_VER}.orig.tar.xz"
 
diff --git a/debian/_buildscripts/local/update_repositories.sh b/debian/_buildscripts/local/update_repositories.sh
index fb0c5aeca..7c415cc4c 100755
--- a/debian/_buildscripts/local/update_repositories.sh
+++ b/debian/_buildscripts/local/update_repositories.sh
@@ -31,7 +31,7 @@ for ((idx=1; idx<=$#; idx++)); do
     else
       ((idx--))
     fi
-	fi
+  fi
 done
 
 # Load common code