diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc
index 9f77d5f..9d964be 100644
--- a/src/Camera/QGCCameraControl.cc
+++ b/src/Camera/QGCCameraControl.cc
@@ -2042,7 +2042,7 @@ QGCCameraControl::_downloadFinished()
 
 void QGCCameraControl::_ftpDownloadComplete(const QString& fileName, const QString& errorMsg)
 {
-    qCDebug(CameraControlLog) << "QGCCameraControl::_ftpDownloadComplete fileName:errorMsg" << fileName << errorMsg;
+    qCDebug(CameraControlLog) << "FTP Download completed: " << fileName << ", " << errorMsg;
 
     disconnect(_vehicle->ftpManager(), &FTPManager::downloadComplete, this, &QGCCameraControl::_ftpDownloadComplete);
     QFile xmlFile(fileName);
diff --git a/src/Vehicle/FTPManager.cc b/src/Vehicle/FTPManager.cc
index b6fa808..65950fa 100644
--- a/src/Vehicle/FTPManager.cc
+++ b/src/Vehicle/FTPManager.cc
@@ -72,7 +72,7 @@ bool FTPManager::download(const QString& fromURI, const QString& toDir, const QS
     }
     lastDirSlashIndex++; // move past slash
 
-    if (fileName.size() == 0) {
+    if (fileName.isEmpty()) {
         _downloadState.fileName = _downloadState.fullPathOnVehicle.right(_downloadState.fullPathOnVehicle.size() - lastDirSlashIndex);
     } else {
         _downloadState.fileName = fileName;
@@ -645,9 +645,9 @@ bool FTPManager::_parseURI(const QString& uri, QString& parsedURI, uint8_t& comp
         if (!ok) {
             qCWarning(FTPManagerLog) << "Incorrect format for component id" << uri;
             return false;
-        } else {
-            qCDebug(FTPManagerLog) << "Found compId:" << (int)compId;
         }
+
+        qCDebug(FTPManagerLog) << "Found compId in MAVLink FTP URI: " << compId;
         parsedURI.replace(QRegularExpression("\\[\\;comp\\=\\d+\\]"), "");
     }