diff --git a/src/gui/server/tcpstreampool.cpp b/src/gui/server/tcpstreampool.cpp
index 10a0bbd85ff86849f73bdb129de9f2c6dfaf7e3a..5d5795713847fcf0172b0c5d24b09f556db46da5 100644
--- a/src/gui/server/tcpstreampool.cpp
+++ b/src/gui/server/tcpstreampool.cpp
@@ -27,7 +27,7 @@ TCPStreamPool::run() {
   char cr13 = '\r'; // we don't want carriage return in empty line
 
   while(!testCancel() && good()) {
-    if (isPending(ost::TCPSocket::pendingInput, 2LU)) {
+    while (isPending(ost::TCPSocket::pendingInput, 2LU)) {
       std::getline(*this, input);
       _debug("TCPStreamPool getline %s\n", input.c_str());
       if (input != null && input[0]!=cr13) {
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 12a384f52128779f102d11d72442b87655a8e26d..18bf93f100c786b987b7d3a115b0cd9c07c5bdfe 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -55,6 +55,8 @@
 #define fill_config_int(name, value) \
   (_config.addConfigTreeItem(section, Conf::ConfigTreeItem(std::string(name), std::string(value), type_int)))
 
+#define DFT_VOIP_LINK 0
+
 ManagerImpl::ManagerImpl (void)
 {
   // initialize random generator  
@@ -339,6 +341,7 @@ ManagerImpl::onHoldCall (CALLID id)
   if ( call->getState() == Call::OnHold || call->isNotAnswered()) {
     return 1;
   }
+  setCurrentCallId(0);
   return call->onHold();
 }
 
@@ -707,7 +710,9 @@ ManagerImpl::peerHungupCall (CALLID id)
   if ( call == NULL ) {
     return -1;
   }
-  stopTone();
+  if ( _currentCallId == id ) {
+    stopTone();
+  }
 
   if (_gui) _gui->peerHungupCall(id);
   deleteCall(id);
@@ -1418,7 +1423,8 @@ ManagerImpl::getAudioDeviceList(const std::string& sequenceId)
 
     tk.clear();
     std::ostringstream str; str << index; tk.push_back(str.str());
-    tk.push_back(std::string(hostApiName) + " (device #" + str.str() + ")");
+    tk.push_back(deviceName);
+    tk.push_back(std::string(hostApiName));
     _gui->sendMessage("100", sequenceId, tk);
   }
   return true;
diff --git a/src/user_cfg.h b/src/user_cfg.h
index 59536138742606b7758246aa7a642144bb820c4f..a0c00cd1ad6ad88cfd47cb90aa73b579bd571a29 100644
--- a/src/user_cfg.h
+++ b/src/user_cfg.h
@@ -78,8 +78,6 @@
 #define EMPTY_FIELD			""
 #define DFT_STUN_SERVER 	"stun.fwdnet.net:3478"
 
-#define DFT_VOIP_LINK         0
-#define DFT_VOIP_LINK_STR    "0" // index of the first VoIP link by default
 #define	YES_STR              "1"
 #define	NO_STR               "0"
 #define DFT_PULSE_LENGTH_STR "250"