diff --git a/src/Vehicle/MAVLinkLogManager.cc b/src/Vehicle/MAVLinkLogManager.cc
index ea153d396cd7b0db9eabc35f799f59bd9a0c7e3a..72e2d6e6e1fe0b179a824acc9651373812fb140b 100644
--- a/src/Vehicle/MAVLinkLogManager.cc
+++ b/src/Vehicle/MAVLinkLogManager.cc
@@ -223,7 +223,6 @@ MAVLinkLogProcessor::_writeUlogMessage(QByteArray& data)
             break;
         _writeData(data.data(), message_length);
         data.remove(0, message_length);
-        return data;
     }
     return data;
 }
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index a3eaa1de601a56383534e76feedef3e9ac931711..11572f8c10e51c4dfdd7e0553f782f706b1e1e11 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -2090,8 +2090,8 @@ Vehicle::_handleMavlinkLoggingData(mavlink_message_t& message)
 void
 Vehicle::_handleMavlinkLoggingDataAcked(mavlink_message_t& message)
 {
-    mavlink_logging_data_t log;
-    mavlink_msg_logging_data_decode(&message, &log);
+    mavlink_logging_data_acked_t log;
+    mavlink_msg_logging_data_acked_decode(&message, &log);
     _ackMavlinkLogData(log.sequence);
     emit mavlinkLogData(this, log.target_system, log.target_component, log.sequence,
         log.first_message_offset, QByteArray((const char*)log.data, log.length), true);