diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index bd70aa5c0..88dc5ffaf 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -416,6 +416,8 @@ dbus_clean ()
     void
 dbus_hold (const callable_obj_t * c)
 {
+    DEBUG("dbus_hold %s\n", c->_callID);
+
     GError *error = NULL;
     org_sflphone_SFLphone_CallManager_hold ( callManagerProxy, c->_callID, &error);
     if (error)
@@ -429,6 +431,8 @@ dbus_hold (const callable_obj_t * c)
     void
 dbus_unhold (const callable_obj_t * c)
 {
+    DEBUG("dbus_unhold %s\n", c->_callID);
+
     GError *error = NULL;
     org_sflphone_SFLphone_CallManager_unhold ( callManagerProxy, c->_callID, &error);
     if (error)
@@ -442,6 +446,8 @@ dbus_unhold (const callable_obj_t * c)
     void
 dbus_hang_up (const callable_obj_t * c)
 {
+    DEBUG("dbus_hang_up %s\n", c->_callID);
+    
     GError *error = NULL;
     org_sflphone_SFLphone_CallManager_hang_up ( callManagerProxy, c->_callID, &error);
     if (error)
@@ -471,6 +477,9 @@ dbus_accept (const callable_obj_t * c)
 #if GTK_CHECK_VERSION(2,10,0)
     status_tray_icon_blink( FALSE );
 #endif
+
+    DEBUG("dbus_accept %s\n", c->_callID);
+
     GError *error = NULL;
     org_sflphone_SFLphone_CallManager_accept ( callManagerProxy, c->_callID, &error);
     if (error)
@@ -487,6 +496,9 @@ dbus_refuse (const callable_obj_t * c)
 #if GTK_CHECK_VERSION(2,10,0)
     status_tray_icon_blink( FALSE );
 #endif
+
+    DEBUG("dbus_refuse %s\n", c->_callID);
+
     GError *error = NULL;
     org_sflphone_SFLphone_CallManager_refuse ( callManagerProxy, c->_callID, &error);
     if (error)
@@ -501,6 +513,8 @@ dbus_refuse (const callable_obj_t * c)
     void
 dbus_place_call (const callable_obj_t * c)
 {
+    DEBUG("dbus_place_call %s\n", c->_callID);
+
     GError *error = NULL;
     org_sflphone_SFLphone_CallManager_place_call ( callManagerProxy, c->_accountID, c->_callID, c->_peer_number, &error);
     if (error)
@@ -1232,8 +1246,7 @@ dbus_set_volume_controls(  )
 dbus_add_participant(const callable_obj_t * c)
 {
 
-    DEBUG("calling dbus_add_participant on CallManager");
-    DEBUG("CallID : %s", c->_callID);
+    DEBUG("dbus_add_participant %s\n", c->_callID);
 
     GError* error = NULL;
     org_sflphone_SFLphone_CallManager_add_participant(
@@ -1251,8 +1264,8 @@ dbus_add_participant(const callable_obj_t * c)
     void
 dbus_set_record(const callable_obj_t * c)
 {
-    DEBUG("calling dbus_set_record on CallManager");
-    DEBUG("CallID : %s", c->_callID);
+    DEBUG("dbus_set_record %s\n", c->_callID);
+
     GError* error = NULL;
     org_sflphone_SFLphone_CallManager_set_recording (
             callManagerProxy,
@@ -1267,7 +1280,7 @@ dbus_set_record(const callable_obj_t * c)
     gboolean
 dbus_get_is_recording(const callable_obj_t * c)
 {
-    DEBUG("calling dbus_get_is_recording on CallManager");
+    DEBUG("dbus_get_is_recording %s\n", c->_callID);
     GError* error = NULL;
     gboolean isRecording;
     org_sflphone_SFLphone_CallManager_get_is_recording (
diff --git a/sflphone-common/src/audio/alsalayer.cpp b/sflphone-common/src/audio/alsalayer.cpp
index dc7dda712..fc5cc01b8 100644
--- a/sflphone-common/src/audio/alsalayer.cpp
+++ b/sflphone-common/src/audio/alsalayer.cpp
@@ -771,6 +771,7 @@ void AlsaLayer::audioCallback (void)
        
             // If nothing urgent, play the regular sound samples
             normalAvail = _mainBuffer.availForGet();
+	    // _debug("Alsa: normalAvail %i\n", normalAvail);
             toGet = (normalAvail < (int) (framesPerBufferAlsa * sizeof (SFLDataFormat))) ? normalAvail : framesPerBufferAlsa * sizeof (SFLDataFormat);
             out = (SFLDataFormat*) malloc (framesPerBufferAlsa * sizeof (SFLDataFormat));
 
diff --git a/sflphone-common/src/audio/mainbuffer.cpp b/sflphone-common/src/audio/mainbuffer.cpp
index 723a1b141..fb88bc5a6 100644
--- a/sflphone-common/src/audio/mainbuffer.cpp
+++ b/sflphone-common/src/audio/mainbuffer.cpp
@@ -93,7 +93,7 @@ bool MainBuffer::removeCallIDSet(CallID set_id)
 
 void MainBuffer::addCallIDtoSet(CallID set_id, CallID call_id)
 {
-    _debug("---- MainBuffer::addCallIDtoSet %s from callid %s\n", set_id.c_str(), call_id.c_str());
+    _debug("---- MainBuffer::addCallIDtoSet %s in %s\n", set_id.c_str(), call_id.c_str());
 
     CallIDSet* callid_set = getCallIDSet(set_id);
     callid_set->insert(call_id);
@@ -102,7 +102,7 @@ void MainBuffer::addCallIDtoSet(CallID set_id, CallID call_id)
 
 void MainBuffer::removeCallIDfromSet(CallID set_id, CallID call_id)
 {
-    _debug("---- MainBuffer::removeCallIDfromSet element %s from set %s\n", call_id.c_str(), set_id.c_str());
+    _debug("---- MainBuffer::removeCallIDfromSet element %s from %s\n", call_id.c_str(), set_id.c_str());
 
     CallIDSet* callid_set = getCallIDSet(set_id);
     if(callid_set != NULL)
@@ -182,7 +182,7 @@ void MainBuffer::bindCallID(CallID call_id1, CallID call_id2)
 
     ost::MutexLock guard (_mutex);
 
-    _debug("---- MainBuffer:: bindCallID %s and callid %s\n", call_id1.c_str(), call_id2.c_str());
+    _debug("---- MainBuffer::bindCallID %s and callid %s\n", call_id1.c_str(), call_id2.c_str());
 
     RingBuffer* ring_buffer;
     CallIDSet* callid_set;
@@ -270,7 +270,6 @@ void MainBuffer::unBindAll(CallID call_id)
     while (iter_set != temp_set.end())
     {
 	CallID call_id_in_set = *iter_set;
-	_debug("--------------- call_id1: %s, call_id2: %s -----------------------", call_id.c_str(), call_id_in_set.c_str());
 	unBindCallID(call_id, call_id_in_set);
 
 	iter_set++;
@@ -404,17 +403,7 @@ int MainBuffer::getDataByID(void *buffer, int toCopy, unsigned short volume, Cal
 	return 0;
     }
 
-    int a;
-
-    // ost::MutexLock guard (_mutex);
-    // a = ring_buffer->AvailForGet(reader_id);
-
-    // if (a >= toCopy) {
     return ring_buffer->Get (buffer, toCopy, volume, reader_id);
-	// } else {
-        // _debug ("RingBuffer is quite empty\n");
-        // return ring_buffer->Get (buffer, a, volume, reader_id);
-	// }
 
     return 0;
 
diff --git a/sflphone-common/src/audio/ringbuffer.cpp b/sflphone-common/src/audio/ringbuffer.cpp
index 8d759ab09..e3eaba859 100644
--- a/sflphone-common/src/audio/ringbuffer.cpp
+++ b/sflphone-common/src/audio/ringbuffer.cpp
@@ -168,10 +168,10 @@ void
 RingBuffer::createReadPointer(CallID call_id)
 {
 
-    _debug("---- createReadPointer call_id %s\n", call_id.c_str());
+    _debug("---- createReadPointer ringbuffer_id %s, call_id %s\n", buffer_id.c_str(), call_id.c_str());
  
     _readpointer.insert(pair<CallID, int>(call_id, mEnd));
-    _debug("---- createReadPointer size:  %i\n", _readpointer.size());
+    _debug("---- createReadPointer ringbuffer_id %s, size %i\n", buffer_id.c_str(),_readpointer.size());
 
 }
 
@@ -180,10 +180,10 @@ void
 RingBuffer::removeReadPointer(CallID call_id)
 {
 
-    _debug("---- removeReadPointer call_id %s\n", call_id.c_str());
+    _debug("---- removeReadPointer ringbuffer_id %s, call_id %s\n", buffer_id.c_str(), call_id.c_str());
 
     _readpointer.erase(call_id);
-    _debug("---- removeReadPointer size:  %i\n", _readpointer.size());
+    _debug("---- removeReadPointer ringbuffer_id %s, size %i\n", buffer_id.c_str(), _readpointer.size());
 
 }
 
diff --git a/sflphone-common/src/dbus/callmanager.cpp b/sflphone-common/src/dbus/callmanager.cpp
index c02fb3e9d..6201252d3 100644
--- a/sflphone-common/src/dbus/callmanager.cpp
+++ b/sflphone-common/src/dbus/callmanager.cpp
@@ -58,7 +58,7 @@ CallManager::accept (const std::string& callID)
 void
 CallManager::hangUp (const std::string& callID)
 {
-    _debug ("CallManager::hangUp received\n");
+    _debug ("CallManager::hangUp received %s\n", callID.c_str());
     Manager::instance().hangupCall (callID);
 
 }
@@ -66,7 +66,7 @@ CallManager::hangUp (const std::string& callID)
 void
 CallManager::hold (const std::string& callID)
 {
-    _debug ("CallManager::hold received\n");
+    _debug ("CallManager::hold received %s\n", callID.c_str());
     Manager::instance().onHoldCall (callID);
 
 }
@@ -74,7 +74,7 @@ CallManager::hold (const std::string& callID)
 void
 CallManager::unhold (const std::string& callID)
 {
-    _debug ("CallManager::unhold received\n");
+    _debug ("CallManager::unhold received %s\n", callID.c_str());
     Manager::instance().offHoldCall (callID);
 }
 
@@ -134,7 +134,7 @@ CallManager::setRecording (const std::string& callID)
 bool
 CallManager::getIsRecording (const std::string& callID)
 {
-    _debug ("CallManager::getIsRecording received  \n");
+    _debug ("CallManager::getIsRecording received \n");
     return Manager::instance().isRecording (callID);
 }