diff --git a/src/jackclient.cpp b/src/jackclient.cpp
index 4ab8ec0..912aa30 100644
--- a/src/jackclient.cpp
+++ b/src/jackclient.cpp
@@ -236,7 +236,7 @@ int CJackClient::SJackProcessCallback(jack_nframes_t nframes, void *arg)
 void CJackClient::PJackProcessCallback(jack_nframes_t nframes)
 {
   unsigned int neededsize = m_outsamples + nframes;
-  if (neededsize > (unsigned int)m_samplerate / 10)
+  if (neededsize > (unsigned int)m_samplerate / 10 + nframes * 2)
   {
     return;
   }
diff --git a/src/util/thread.cpp b/src/util/thread.cpp
index c07182c..1512171 100644
--- a/src/util/thread.cpp
+++ b/src/util/thread.cpp
@@ -40,6 +40,8 @@ void* CThread::ThreadFunction(void* args)
   CThread* thread = reinterpret_cast<CThread*>(args);
   thread->Process();
   thread->m_running = false;
+
+  return NULL;
 }
 
 void CThread::Process()