diff --git a/src/audio/audiortp.cpp b/src/audio/audiortp.cpp
index 82453849e3fdb19852ab3f96997ebfc0d5a443e7..ef7c1cb79393b1528ced37692a725c88b9eb4eae 100644
--- a/src/audio/audiortp.cpp
+++ b/src/audio/audiortp.cpp
@@ -265,7 +265,7 @@ AudioRtpRTX::receiveSessionForSpkr (int16* data_for_speakers,
 	// Notify (with a beep) an incoming call when there is already a call 
 	countTime += time->getSecond();
 	if (Manager::instance().incomingCallWaiting() > 0) {
-		countTime = countTime % 4000;
+		countTime = countTime % 2000; // more often...
 		if (countTime < 100 and countTime > 0) {
 			Manager::instance().notificationIncomingCall();
 		}
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 8a98b260a231f9e1bfdac57fb2623916fda9341b..f9789e02e48ba2e1fc6baed0e0464a650d3187ed 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -406,7 +406,9 @@ ManagerImpl::mute() {
  */
 void
 ManagerImpl::unmute() {
-  setMicVolume(_mic_volume_before_mute);
+  if ( _mic_volume == 0 ) {
+    setMicVolume(_mic_volume_before_mute);
+  }
 }
 
 /**
@@ -954,7 +956,7 @@ void
 ManagerImpl::notificationIncomingCall (void) {
   int16* buf_ctrl_vol;
   int16* buffer = new int16[SAMPLING_RATE];
-  int size = SAMPLES_SIZE(FRAME_PER_BUFFER);//SAMPLING_RATE/2;
+  int size = SAMPLES_SIZE(FRAME_PER_BUFFER); //SAMPLING_RATE/2;
   int k;
   //int spkrVolume;
 
diff --git a/src/managerimpl.h b/src/managerimpl.h
index 573b4fb33d2c7460412779c384b97c12f6b6802a..8ac3a53fd344a17a8614bd98de81420e1ded879a 100644
--- a/src/managerimpl.h
+++ b/src/managerimpl.h
@@ -238,7 +238,7 @@ name);
     return _mic_volume;
   }
   void setMicVolume(unsigned short mic_vol) { 
-    _mic_volume = _mic_volume_before_mute = mic_vol; 
+    _mic_volume = mic_vol; 
   }
 
   bool hasLoadedSetup() { return _setupLoaded; }
diff --git a/src/sipvoiplink.cpp b/src/sipvoiplink.cpp
index c67dd9c7413edffc8bf47c064bc7e40d9747c5c4..765f0642f9ef9119b2810be1758deeeda0ba555e 100644
--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
@@ -90,6 +90,7 @@ SipVoIPLink::init (void)
   }
 	
   srand (time(NULL));
+  //should be NULL or INADDR_ANY for the second parameter?
   i = eXosip_listen_addr(IPPROTO_UDP, NULL, DEFAULT_SIP_PORT, AF_INET, 0);
   if (i != 0) {
     i = eXosip_listen_addr(IPPROTO_UDP, NULL, RANDOM_SIP_PORT, AF_INET, 0);
@@ -605,7 +606,7 @@ SipVoIPLink::refuse (CALLID id)
 int
 SipVoIPLink::getEvent (void)
 {
-  eXosip_event_t* event = eXosip_event_wait (0, 50);
+  eXosip_event_t* event = eXosip_event_wait (0, 1);
   eXosip_lock();
   eXosip_automatic_action();
   eXosip_unlock();
@@ -618,7 +619,7 @@ SipVoIPLink::getEvent (void)
   CALLID id = 0;
   int returnValue = 0;
 
-  //_debug("GetEvent : %d ", event->type);
+  _debug("Receive SipEvent #%d\n", event->type);
   switch (event->type) {
     // IP-Phone user receives a new call
   case EXOSIP_CALL_INVITE: //