diff --git a/lib/native/mac/libjportaudio.jnilib b/lib/native/mac/libjportaudio.jnilib
index b83be4d4c..7347d9709 100755
Binary files a/lib/native/mac/libjportaudio.jnilib and b/lib/native/mac/libjportaudio.jnilib differ
diff --git a/src/native/portaudio/README b/src/native/portaudio/README
index 25d8a51e1..67b44288b 100644
--- a/src/native/portaudio/README
+++ b/src/native/portaudio/README
@@ -54,7 +54,7 @@
     - Mac OS X
     CC=gcc -arch i386 -arch ppc -arch x86_64 -mmacosx-version-min=10.3
     LDFLAGS=-dynamiclib
-    LIBS=-L$(PORTAUDIO_HOME)/lib/.libs -framework AudioToolbox -framework AudioUnit -framework CoreAudio -framework Carbon -lpthread -pthread -dynamic -lportaudio -lspeexdsp
+    LIBS=-L$(SPEEX_HOME)/libspeex/.libs -L$(PORTAUDIO_HOME)/lib/.libs -framework AudioToolbox -framework AudioUnit -framework CoreAudio -framework Carbon -lpthread -pthread -dynamic -lportaudio -lspeexdsp
     $ make
 
     - Windows
diff --git a/src/net/java/sip/communicator/impl/neomedia/device/DeviceConfiguration.java b/src/net/java/sip/communicator/impl/neomedia/device/DeviceConfiguration.java
index 910755aed..6a26ece91 100644
--- a/src/net/java/sip/communicator/impl/neomedia/device/DeviceConfiguration.java
+++ b/src/net/java/sip/communicator/impl/neomedia/device/DeviceConfiguration.java
@@ -129,7 +129,7 @@ public class DeviceConfiguration
 
     /**
      * Property used to store the latency option we use for current OS.
-     * Must be like 0.1(means 100 ms.).
+     * Must be in milliseconds.
      */
     private static final String PROP_AUDIO_LATENCY =
         "net.java.sip.communicator.impl.neomedia.latency";
diff --git a/src/net/java/sip/communicator/impl/neomedia/portaudio/streams/MasterPortAudioStream.java b/src/net/java/sip/communicator/impl/neomedia/portaudio/streams/MasterPortAudioStream.java
index b73bff851..6cd908f66 100644
--- a/src/net/java/sip/communicator/impl/neomedia/portaudio/streams/MasterPortAudioStream.java
+++ b/src/net/java/sip/communicator/impl/neomedia/portaudio/streams/MasterPortAudioStream.java
@@ -106,6 +106,10 @@ synchronized void start(InputPortAudioStream slave)
             if(stream == 0)
                 initStream();
 
+            // if still not initted return
+            if(stream == 0)
+                return;
+
             // start
             PortAudio.Pa_StartStream(stream);
             started = true;