diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index cc9dc5740..836dee391 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -63,8 +63,11 @@ QString getInputStr(ModelData & model, int index)
   QString result;
 
   if (GetCurrentFirmware()->getCapability(VirtualInputs)) {
-    result = model.inputNames[index];
-    if (result.isEmpty()) {
+    if (strlen(model.inputNames[index]) > 0) {
+      result = QObject::tr("[I%1]").arg(index+1);
+      result += QString(model.inputNames[index]);
+    }
+    else {
       result = QObject::tr("Input%1").arg(index+1, 2, 10, QChar('0'));
     }
   }
diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
index 3852264c7..9c7d8d5f3 100644
--- a/companion/src/modeledit/inputs.cpp
+++ b/companion/src/modeledit/inputs.cpp
@@ -144,13 +144,13 @@ QString InputsPanel::getInputText(int dest, bool * new_ch)
     if ((dest == 0) || (model.expoData[dest-1].chn != md->chn)) {
       if (new_ch) *new_ch = 1;
       if (firmware->getCapability(VirtualInputs))
-        str = QString("%1").arg(getInputStr(model, md->chn), -8, ' ');
+        str = QString("%1").arg(getInputStr(model, md->chn), -10, ' ');
       else
         str = getInputStr(model, md->chn);
     }
     else {
       if (firmware->getCapability(VirtualInputs))
-        str = "        ";
+        str = "          ";
       else
         str = "   ";
     }
diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp
index 56bf98c47..7b01d83e6 100644
--- a/companion/src/modeledit/mixes.cpp
+++ b/companion/src/modeledit/mixes.cpp
@@ -170,6 +170,10 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch)
       default:  str += "  "; break;
     };
 
+    //set mixer src model if it is unset (srcRaw needs this to generate proper toString() for input source type)
+    if (md->srcRaw.model == 0) 
+      md->srcRaw.model = &model;  
+    
     //highlight source if needed
     if ( (md->srcRaw.type == SOURCE_TYPE_CH) && (md->srcRaw.index+1 == (int)highlightedSource) ) {
       str += " <b>" + Qt::escape(md->srcRaw.toString()) + "</b>";