diff --git a/flight/modules/Receiver/receiver.c b/flight/modules/Receiver/receiver.c
index 90ea959a6..595a94260 100644
--- a/flight/modules/Receiver/receiver.c
+++ b/flight/modules/Receiver/receiver.c
@@ -655,6 +655,9 @@ static bool updateRcvrActivityCompare(uint32_t rcvr_id, struct rcvr_activity_fsm
             case MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMFLEXIPORT:
                 group = RECEIVERACTIVITY_ACTIVEGROUP_DSMFLEXIPORT;
                 break;
+            case MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMRCVRPORT:
+                group = RECEIVERACTIVITY_ACTIVEGROUP_DSMRCVRPORT;
+                break;
             case MANUALCONTROLSETTINGS_CHANNELGROUPS_EXBUS:
                 group = RECEIVERACTIVITY_ACTIVEGROUP_EXBUS;
                 break;
diff --git a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
index 763d5788b..f01ff95e9 100644
--- a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
+++ b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
@@ -212,7 +212,7 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
                 data.SPK2_RcvrPort = HwSettings::SPK2_RCVRPORT_SBUS;
             } else {
                 data.RM_MainPort = HwSettings::RM_MAINPORT_SBUS;
-                // We have to set telemetry on flexport since s.bus needs the mainport on all but Revo.
+                // We have to set telemetry to flexport on all except Revo (and except Sparky2) since s.bus needs the mainport.
                 if (m_configSource->getControllerType() != VehicleConfigurationSource::CONTROLLER_REVO) {
                     data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_TELEMETRY;
                 }
@@ -238,10 +238,10 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
             data.OptionalModules[HwSettings::OPTIONALMODULES_GPS] = 1;
             data.GPSSpeed = HwSettings::GPSSPEED_57600;
 
-            // if using GPS and SBUS on Revo, we must use FlexiPort for GPS
+            // if using GPS and SBUS on Revo or Nano, we must use FlexiPort for GPS
             // since we must use MainPort for SBUS
             if (m_configSource->getInputType() == VehicleConfigurationSource::INPUT_SBUS
-                && m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO) {
+                && m_configSource->getControllerType() != VehicleConfigurationSource::CONTROLLER_SPARKY2) {
                 data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_GPS;
             } else {
                 data.RM_MainPort = HwSettings::RM_MAINPORT_GPS;
@@ -1372,6 +1372,7 @@ void VehicleConfigurationHelper::setupHexaCopter()
         channels[0].pitch     = 25;
         channels[0].yaw = -66;
 
+
         channels[1].type      = MIXER_TYPE_MOTOR;
         channels[1].throttle1 = 100;
         channels[1].throttle2 = 0;
diff --git a/shared/uavobjectdefinition/receiveractivity.xml b/shared/uavobjectdefinition/receiveractivity.xml
index 4e664e9fe..27c2d007c 100644
--- a/shared/uavobjectdefinition/receiveractivity.xml
+++ b/shared/uavobjectdefinition/receiveractivity.xml
@@ -2,7 +2,7 @@
     <object name="ReceiverActivity" singleinstance="true" settings="false" category="System">
         <description>Monitors which receiver channels have been active within the last second.</description>
 	<field name="ActiveGroup" units="Channel Group" type="enum" elements="1"
-           options="PWM,PPM,DSM (MainPort),DSM (FlexiPort),S.Bus,EX.Bus,HoTT,SRXL,GCS,OPLink,None"
+           options="PWM,PPM,DSM (MainPort),DSM (FlexiPort),DSM (RcvrPort),S.Bus,EX.Bus,HoTT,SRXL,GCS,OPLink,None"
 	       defaultvalue="None"/>
 	<field name="ActiveChannel" units="channel" type="uint8" elements="1"
 	       defaultvalue="255"/>