diff --git a/app/videostreaming/gstreamer/gstqmlglsinkstream.h b/app/videostreaming/gstreamer/gstqmlglsinkstream.h
index c1b38fb6f..e0011e33d 100755
--- a/app/videostreaming/gstreamer/gstqmlglsinkstream.h
+++ b/app/videostreaming/gstreamer/gstqmlglsinkstream.h
@@ -73,7 +73,6 @@ class GstQmlGlSinkStream : public QObject{
     bool firstCheck=true;
     //
     int nTimesVideoQmlElementNotSet=0;
-    QString logPrefix()const{return m_isPrimaryStream ? "[PrimaryVideo]" : "[SecondaryVideo]";}
 };
 
 #endif // OpenHDVideoStream_H
diff --git a/build_qmake.sh b/build_qmake.sh
index 83edc1ebb..2f03e8f2e 100755
--- a/build_qmake.sh
+++ b/build_qmake.sh
@@ -2,8 +2,13 @@
 
 set -euo pipefail
 
+# Force Qt 5 tools when both Qt 5 and Qt 6 are installed
+export QT_SELECT="${QT_SELECT:-qt5}"
+
 # Ensure submodules are available for the build
-if [ ! -d "lib/mavlink-headers" ]; then
+MAVLINK_HEADER="lib/mavlink-headers/mavlink/v2.0/openhd/mavlink.h"
+if [ ! -f "${MAVLINK_HEADER}" ]; then
+    echo "Syncing git submodules (mavlink headers missing)..."
     git submodule update --init --recursive
 fi
 
diff --git a/install_build_dep.sh b/install_build_dep.sh
index 61f25a67d..e549cb34e 100755
--- a/install_build_dep.sh
+++ b/install_build_dep.sh
@@ -41,7 +41,7 @@ PLATFORM_PACKAGES="qml-module-qt-labs-platform"
  if [[ "${QTTYPE}" == "custom" ]]; then
     apt install -y openhd-qt 
  else
-    apt -y install qml-module-qtquick-controls2 libqt5texttospeech5-dev libqt5concurrent5 libqt5core5a libqt5dbus5 libqt5designer5 libqt5gui5 libqt5help5 libqt5location5 libqt5location5-plugins libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediawidgets5 libqt5network5 libqt5opengl5 libqt5opengl5-dev libqt5positioning5 libqt5positioning5-plugins libqt5positioningquick5 libqt5printsupport5 libqt5qml5 libqt5quick5 libqt5quickparticles5 libqt5quickshapes5 libqt5quicktest5 libqt5quickwidgets5 libqt5sensors5 libqt5sql5 libqt5sql5-sqlite libqt5svg5 libqt5test5 libqt5webchannel5 libqt5webkit5 libqt5widgets5 libqt5x11extras5 libqt5xml5 openshot-qt python3-pyqt5 python3-pyqt5.qtopengl python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-pyqtgraph qml-module-qt-labs-settings qml-module-qtgraphicaleffects qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-controls qml-module-qtquick-dialogs qml-module-qtquick-extras qml-module-qtquick-layouts qml-module-qtquick-privatewidgets qml-module-qtquick-shapes qml-module-qtquick-window2 qml-module-qtquick2 qt5-gtk-platformtheme qt5-qmake qt5-qmake-bin qt5-qmltooling-plugins qtbase5-dev qtbase5-dev-tools qtchooser qtdeclarative5-dev qtdeclarative5-dev-tools qtpositioning5-dev qttools5-dev-tools qttranslations5-l10n libqt5charts5-dev
+    apt -y install qml-module-qtquick-controls2 libqt5texttospeech5-dev libqt5concurrent5 libqt5core5a libqt5dbus5 libqt5designer5 libqt5gui5 libqt5help5 libqt5location5 libqt5location5-plugins libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediawidgets5 qtmultimedia5-dev libqt5network5 libqt5opengl5 libqt5opengl5-dev libqt5positioning5 libqt5positioning5-plugins libqt5positioningquick5 libqt5printsupport5 libqt5qml5 libqt5quick5 libqt5quickparticles5 libqt5quickshapes5 libqt5quicktest5 libqt5quickwidgets5 libqt5sensors5 libqt5sql5 libqt5sql5-sqlite libqt5svg5 libqt5test5 libqt5webchannel5 libqt5webkit5 libqt5widgets5 libqt5x11extras5 libqt5xml5 openshot-qt python3-pyqt5 python3-pyqt5.qtopengl python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-pyqtgraph qml-module-qt-labs-settings qml-module-qtgraphicaleffects qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-controls qml-module-qtquick-dialogs qml-module-qtquick-extras qml-module-qtquick-layouts qml-module-qtquick-privatewidgets qml-module-qtquick-shapes qml-module-qtquick-window2 qml-module-qtquick2 qt5-gtk-platformtheme qt5-qmake qt5-qmake-bin qt5-qmltooling-plugins qtbase5-dev qtbase5-dev-tools qtchooser qtdeclarative5-dev qtdeclarative5-dev-tools qtpositioning5-dev qttools5-dev-tools qttranslations5-l10n libqt5charts5-dev
  fi
 
  # Install platform-specific packages