diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobject.cpp b/ground/openpilotgcs/src/plugins/uavobjects/uavobject.cpp
index c1ba625fc..47960b060 100644
--- a/ground/openpilotgcs/src/plugins/uavobjects/uavobject.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobject.cpp
@@ -531,7 +531,7 @@ void UAVObject::SetGcsAccess(UAVObject::Metadata& metadata, UAVObject::AccessMod
  * \param[in] metadata The metadata object
  * \return the telemetry acked boolean
  */
-uint8_t UAVObject::GetFlightTelemetryAcked(const UAVObject::Metadata& metadata) {
+quint8 UAVObject::GetFlightTelemetryAcked(const UAVObject::Metadata& metadata) {
 	return (metadata.flags >> UAVOBJ_TELEMETRY_ACKED_SHIFT) & 1;
 }
 
@@ -540,7 +540,7 @@ uint8_t UAVObject::GetFlightTelemetryAcked(const UAVObject::Metadata& metadata)
  * \param[in] metadata The metadata object
  * \param[in] val The telemetry acked boolean
  */
-void UAVObject::SetFlightTelemetryAcked(UAVObject::Metadata& metadata, uint8_t val) {
+void UAVObject::SetFlightTelemetryAcked(UAVObject::Metadata& metadata, quint8 val) {
 	SET_BITS(metadata.flags, UAVOBJ_TELEMETRY_ACKED_SHIFT, val, 1);
 }
 
@@ -549,7 +549,7 @@ void UAVObject::SetFlightTelemetryAcked(UAVObject::Metadata& metadata, uint8_t v
  * \param[in] metadata The metadata object
  * \return the telemetry acked boolean
  */
-uint8_t UAVObject::GetGcsTelemetryAcked(const UAVObject::Metadata& metadata) {
+quint8 UAVObject::GetGcsTelemetryAcked(const UAVObject::Metadata& metadata) {
 	return (metadata.flags >> UAVOBJ_GCS_TELEMETRY_ACKED_SHIFT) & 1;
 }
 
@@ -558,7 +558,7 @@ uint8_t UAVObject::GetGcsTelemetryAcked(const UAVObject::Metadata& metadata) {
  * \param[in] metadata The metadata object
  * \param[in] val The GCS telemetry acked boolean
  */
-void UAVObject::SetGcsTelemetryAcked(UAVObject::Metadata& metadata, uint8_t val) {
+void UAVObject::SetGcsTelemetryAcked(UAVObject::Metadata& metadata, quint8 val) {
 	SET_BITS(metadata.flags, UAVOBJ_GCS_TELEMETRY_ACKED_SHIFT, val, 1);
 }
 
diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobject.h b/ground/openpilotgcs/src/plugins/uavobjects/uavobject.h
index 62b96da02..e1264a607 100644
--- a/ground/openpilotgcs/src/plugins/uavobjects/uavobject.h
+++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobject.h
@@ -89,10 +89,10 @@ public:
      *    6-7    gcsTelemetryUpdateMode     Update mode used by the GCS (UAVObjUpdateMode)
      */
      typedef struct {
-         uint8_t flags; /** Defines flags for update and logging modes and whether an update should be ACK'd (bits defined above) */
-         uint16_t flightTelemetryUpdatePeriod; /** Update period used by the telemetry module (only if telemetry mode is PERIODIC) */
-         uint16_t gcsTelemetryUpdatePeriod; /** Update period used by the GCS (only if telemetry mode is PERIODIC) */
-         uint16_t loggingUpdatePeriod; /** Update period used by the logging module (only if logging mode is PERIODIC) */
+        quint8 flags; /** Defines flags for update and logging modes and whether an update should be ACK'd (bits defined above) */
+        quint16 flightTelemetryUpdatePeriod; /** Update period used by the telemetry module (only if telemetry mode is PERIODIC) */
+        quint16 gcsTelemetryUpdatePeriod; /** Update period used by the GCS (only if telemetry mode is PERIODIC) */
+        quint16 loggingUpdatePeriod; /** Update period used by the logging module (only if logging mode is PERIODIC) */
      } __attribute__((packed)) Metadata;
 
 
@@ -131,10 +131,10 @@ public:
     static void SetFlightAccess(Metadata& meta, AccessMode mode);
     static AccessMode GetGcsAccess(const Metadata& meta);
     static void SetGcsAccess(Metadata& meta, AccessMode mode);
-    static uint8_t GetFlightTelemetryAcked(const Metadata& meta);
-    static void SetFlightTelemetryAcked(Metadata& meta, uint8_t val);
-    static uint8_t GetGcsTelemetryAcked(const Metadata& meta);
-    static void SetGcsTelemetryAcked(Metadata& meta, uint8_t val);
+    static quint8 GetFlightTelemetryAcked(const Metadata& meta);
+    static void SetFlightTelemetryAcked(Metadata& meta, quint8 val);
+    static quint8 GetGcsTelemetryAcked(const Metadata& meta);
+    static void SetGcsTelemetryAcked(Metadata& meta, quint8 val);
     static UpdateMode GetFlightTelemetryUpdateMode(const Metadata& meta);
     static void SetFlightTelemetryUpdateMode(Metadata& meta, UpdateMode val);
     static UpdateMode GetGcsTelemetryUpdateMode(const Metadata& meta);