diff --git a/companion/src/updates/updatefirmware.cpp b/companion/src/updates/updatefirmware.cpp
index 0bd9dc758..513dc5655 100644
--- a/companion/src/updates/updatefirmware.cpp
+++ b/companion/src/updates/updatefirmware.cpp
@@ -64,7 +64,10 @@ bool UpdateFirmware::asyncInstall()
   if (!assets->subDirectory().isEmpty())
     destPath.append("/" % assets->subDirectory());
 
-  QRegularExpression filter(runParams->data.assets.at(0).copyFilter, QRegularExpression::CaseInsensitiveOption);
+  const UpdateParameters::AssetParams &ap = runParams->data.assets.at(0);
+
+  QString pattern(runParams->buildFilterPattern(ap.copyFilterType, ap.copyFilter));
+  QRegularExpression filter(pattern, QRegularExpression::CaseInsensitiveOption);
 
   QDirIterator it(destPath);
 
diff --git a/companion/src/updates/updateinterface.cpp b/companion/src/updates/updateinterface.cpp
index c233daafc..bec914103 100644
--- a/companion/src/updates/updateinterface.cpp
+++ b/companion/src/updates/updateinterface.cpp
@@ -96,7 +96,7 @@ UpdateParameters::AssetParams & UpdateParameters::addAsset()
   return data.assets[data.assets.size() - 1];
 }
 
-QString UpdateParameters::buildFilterPattern(const UpdateParameters::UpdateFilterType filterType, const QString & filter)
+QString UpdateParameters::buildFilterPattern(const UpdateFilterType filterType, const QString & filter)
 {
   QString pattern(filter);
 
@@ -330,7 +330,7 @@ void UpdateInterface::progressMessage(const QString & text)
 
 void UpdateInterface::criticalMsg(const QString & msg)
 {
-  QMessageBox::critical(nullptr, CPN_STR_APP_NAME % ": " % tr("Update Interface"), msg);
+  QMessageBox::critical(nullptr, tr("Update Interface"), msg);
 }
 
 void UpdateInterface::setName(QString name)