diff --git a/jni/redphone/WebRtcJitterBuffer.cpp b/jni/redphone/WebRtcJitterBuffer.cpp
index da032932c8..fbb6c36298 100644
--- a/jni/redphone/WebRtcJitterBuffer.cpp
+++ b/jni/redphone/WebRtcJitterBuffer.cpp
@@ -29,7 +29,7 @@ int WebRtcJitterBuffer::init() {
     return -1;
   }
 
-  pthread_create(&stats, NULL, &WebRtcJitterBuffer::collectStats, this);
+//  pthread_create(&stats, NULL, &WebRtcJitterBuffer::collectStats, this);
 
   return 0;
 }
@@ -67,12 +67,12 @@ int WebRtcJitterBuffer::getAudio(short *rawData, int maxRawData) {
 }
 
 void WebRtcJitterBuffer::stop() {
-  pthread_mutex_lock(&lock);
+//  pthread_mutex_lock(&lock);
   running = 0;
-  pthread_cond_signal(&condition);
-  pthread_mutex_unlock(&lock);
+//  pthread_cond_signal(&condition);
+//  pthread_mutex_unlock(&lock);
 
-  pthread_join(stats, NULL);
+//  pthread_join(stats, NULL);
 }
 
 void WebRtcJitterBuffer::collectStats() {
diff --git a/libs/armeabi-v7a/libredphone-audio.so b/libs/armeabi-v7a/libredphone-audio.so
index 70e1be6dce..df76528c85 100755
Binary files a/libs/armeabi-v7a/libredphone-audio.so and b/libs/armeabi-v7a/libredphone-audio.so differ
diff --git a/libs/armeabi/libredphone-audio.so b/libs/armeabi/libredphone-audio.so
index 7d4225f470..a059de6d6d 100755
Binary files a/libs/armeabi/libredphone-audio.so and b/libs/armeabi/libredphone-audio.so differ
diff --git a/libs/x86/libredphone-audio.so b/libs/x86/libredphone-audio.so
index 6eb6a04e1b..1e8e87c43b 100755
Binary files a/libs/x86/libredphone-audio.so and b/libs/x86/libredphone-audio.so differ
diff --git a/src/org/thoughtcrime/redphone/RedPhone.java b/src/org/thoughtcrime/redphone/RedPhone.java
index bd84dc567b..7e5a335c81 100644
--- a/src/org/thoughtcrime/redphone/RedPhone.java
+++ b/src/org/thoughtcrime/redphone/RedPhone.java
@@ -166,6 +166,7 @@ public class RedPhone extends Activity {
     Log.w(TAG, "Termination Stack:", new Exception());
 
     callScreen.setActiveCall(recipient, getString(R.string.RedPhone_ending_call));
+    EventBus.getDefault().removeStickyEvent(RedPhoneEvent.class);
 
     delayedFinish();
   }
diff --git a/src/org/thoughtcrime/redphone/RedPhoneService.java b/src/org/thoughtcrime/redphone/RedPhoneService.java
index 71ef607a47..bd493c45b2 100644
--- a/src/org/thoughtcrime/redphone/RedPhoneService.java
+++ b/src/org/thoughtcrime/redphone/RedPhoneService.java
@@ -121,6 +121,7 @@ public class RedPhoneService extends Service implements CallStateListener, CallS
 
   @Override
   public void onStart(Intent intent, int startId) {
+    Log.w(TAG, "onStart(): " + intent);
     if (intent == null) return;
     new Thread(new IntentRunnable(intent)).start();
   }
@@ -148,6 +149,7 @@ public class RedPhoneService extends Service implements CallStateListener, CallS
     else if (intent.getAction().equals(ACTION_DENY_CALL))                 handleDenyCall(intent);
     else if (intent.getAction().equals(ACTION_HANGUP_CALL))               handleHangupCall(intent);
     else if (intent.getAction().equals(ACTION_SET_MUTE))                  handleSetMute(intent);
+    else Log.w(TAG, "Unhandled intent: " + intent.getAction() + ", state: " + state);
   }
 
   ///// Initializers