diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp
index f5763eb95..add3f27e9 100644
--- a/src/engines/gstenginepipeline.cpp
+++ b/src/engines/gstenginepipeline.cpp
@@ -248,6 +248,10 @@ bool GstEnginePipeline::Init() {
       case QVariant::Int:
         g_object_set(G_OBJECT(audiosink_), "device", device_.toInt(), nullptr);
         break;
+      case QVariant::LongLong:
+        g_object_set(G_OBJECT(audiosink_), "device", device_.toLongLong(),
+                     nullptr);
+        break;
       case QVariant::String:
         g_object_set(G_OBJECT(audiosink_), "device",
                      device_.toString().toUtf8().constData(), nullptr);
diff --git a/src/engines/osxdevicefinder.cpp b/src/engines/osxdevicefinder.cpp
index 035000013..4a430f0d1 100644
--- a/src/engines/osxdevicefinder.cpp
+++ b/src/engines/osxdevicefinder.cpp
@@ -107,6 +107,7 @@ QList<DeviceFinder::Device> OsxDeviceFinder::ListDevices() {
     Device dev;
     dev.description = QString::fromUtf8(
         CFStringGetCStringPtr(*device_name, CFStringGetSystemEncoding()));
+    if (dev.description.isEmpty()) dev.description = QString("Unknown device");
     dev.device_property_value = id;
     dev.icon_name = GuessIconName(dev.description);
     ret.append(dev);