diff --git a/.appveyor.yml b/.appveyor.yml
index 5f5d0b7f887002a6534a8cfe58d6b757c4569ed4..57050f41ceb2a3b58c59bd36502e178673aab38d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -61,7 +61,7 @@ for:
 -
   branches:
     only:
-      - Stable_V3.4
+      - Stable_V3.5
   artifacts:
     - path: QGroundControl-installer.exe
       name: qgcinstaller
diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index 957af8c6456d70201cf814281ded11343c0c2ed3..43e46a8c552451544649af01a2f0512caf10c36f 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -994,7 +994,7 @@ void LinkManager::startAutoConnectedLinks(void)
 int LinkManager::_reserveMavlinkChannel(void)
 {
     // Find a mavlink channel to use for this link, Channel 0 is reserved for internal use.
-    for (uint8_t mavlinkChannel = 1; mavlinkChannel < 32; mavlinkChannel++) {
+    for (uint8_t mavlinkChannel = 1; mavlinkChannel < MAVLINK_COMM_NUM_BUFFERS; mavlinkChannel++) {
         if (!(_mavlinkChannelsUsedBitMask & 1 << mavlinkChannel)) {
             mavlink_reset_channel_status(mavlinkChannel);
             // Start the channel on Mav 1 protocol