diff --git a/devsetup.cpp b/devsetup.cpp
index 1c3155136..b8836f8b7 100644
--- a/devsetup.cpp
+++ b/devsetup.cpp
@@ -64,7 +64,8 @@ void DevSetup::initDlg()
       QString t(p2);
 #else
       QString t;
-      t.sprintf("%2d   %d   %-8s  %-39s",id,nchin,p1,pdi->name);
+      t.sprintf("%2d   %d   %-8s  %-39s",id,nchin,
+                Pa_GetHostApiInfo(pdi->hostApi)->name,pdi->name);
 #endif
       ui.comboBoxSndIn->addItem(t);
     }
@@ -84,7 +85,7 @@ void DevSetup::initDlg()
 #ifdef WIN32
 // Needs work to compile for Linux
       p1=(char*)"";
-      p=strstr(pa_device_hostapi,"MME");
+      p=strstr(pa_device_hostapi,"MME");Pa_GetHostApiInfo(pdi->hostApi)->name
 
       if(p!=NULL) p1=(char*)"MME";
       p=strstr(pa_device_hostapi,"Direct");
@@ -99,7 +100,8 @@ void DevSetup::initDlg()
       QString t(p2);
 #else
       QString t;
-      t.sprintf("%2d   %d   %-8s  %-39s",id,nchin,p1,pdi->name);
+      t.sprintf("%2d   %d   %-8s  %-39s",id,nchout,
+                Pa_GetHostApiInfo(pdi->hostApi)->name,pdi->name);
 #endif
       ui.comboBoxSndOut->addItem(t);
     }
diff --git a/mainwindow.cpp b/mainwindow.cpp
index fe6054f65..813d50268 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//------------------------------------------------------------- MainWindow
+//------------------------------------------------------------ MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
diff --git a/soundout.cpp b/soundout.cpp
index 2d2eefb89..31f67bcab 100644
--- a/soundout.cpp
+++ b/soundout.cpp
@@ -143,6 +143,9 @@ void SoundOutThread::run()
 
   outParam.device=m_nDevOut;                 //Output device number
   outParam.channelCount=1;                   //Number of analog channels
+#ifdef unix
+  outParam.channelCount=2;                   //Number of analog channels
+#endif
   outParam.sampleFormat=paInt16;             //Send short ints to PortAudio
   outParam.suggestedLatency=0.05;
   outParam.hostApiSpecificStreamInfo=NULL;