diff --git a/src/libraries/libisc-new/demo/tcp.c b/src/libraries/libisc-new/demo/tcp.c
index cf39316c90e0343f65635515a1be74af9b1af588..563ca879a338eb3eec5681baf3a86c7f2dfafc37 100644
--- a/src/libraries/libisc-new/demo/tcp.c
+++ b/src/libraries/libisc-new/demo/tcp.c
@@ -73,7 +73,7 @@ main(void)
   /*
   ** Enable remote connection attempts at port #20000 and #20001
   */
-  if (isc_listentcp(mcb, "localhost", "20000") == NULL)
+  if (isc_listentcp(mcb, "localhost", "test-service") == NULL)
     Perror("isc_listentcp-20000");
 
   if (isc_listentcp(mcb, NULL, "20001") == NULL)
diff --git a/src/libraries/libisc-new/src/intern.h b/src/libraries/libisc-new/src/intern.h
index e811a6fc13b9587cd401182fe1627d4532d55d18..800d7ed0032a3d05e3be1270fb359628e0fec776 100644
--- a/src/libraries/libisc-new/src/intern.h
+++ b/src/libraries/libisc-new/src/intern.h
@@ -40,8 +40,12 @@ isc_strdup(const char *str);
 extern IscMsgQueue *
 isc_newqueue(void);
 
+#if 0
 extern int
 isc_pollqueue(IscMsgQueue *queue);
+#else
+#define isc_pollqueue(qp)	((qp) != NULL && ((qp)->head != NULL))
+#endif
 
 extern void
 isc_killqueue(IscMsgQueue *queue);
diff --git a/src/libraries/libisc-new/src/isc.h b/src/libraries/libisc-new/src/isc.h
index 0ec7d43ddff0b86b01a73ffc4e390c33282aa4b8..6c447bf4843f0c485fa04013263564f43201b76c 100644
--- a/src/libraries/libisc-new/src/isc.h
+++ b/src/libraries/libisc-new/src/isc.h
@@ -485,6 +485,11 @@ isc_flush(IscSession  * scb);
 extern int
 isc_send(IscSession  * scb, IscMessage  * mcb);
 
+extern int
+isc_sendto(IscSession  * scb,
+	   IscAddress  * ap,
+	   IscMessage  * mcb);
+
 
 
 /*
diff --git a/src/libraries/libisc-new/src/isc_event.c b/src/libraries/libisc-new/src/isc_event.c
index 490c8d9572233d81dc18fee1c4075cb54d2ec721..601e57b57580b6ae72cf9a417b7d11549f092fbb 100644
--- a/src/libraries/libisc-new/src/isc_event.c
+++ b/src/libraries/libisc-new/src/isc_event.c
@@ -11,6 +11,7 @@
 **    910303 ceder     clean up. Removed everything that is lyskom-specific.
 **    910304 pen       really removed everything lyskom-specific.. :-)
 **    920129 pen       added support for "lazy" connect
+**    920805 pen       one unneccessary isc_pollqueue() removed.
 */
 
 #include <stdio.h>
@@ -307,10 +308,9 @@ RETRY:
     scb = isl->scb;
 
     
-    if (isc_pollqueue(scb->rd_msg_q))
+    if (event->msg = isc_popqueue(scb->rd_msg_q))
     {
       event->session = scb;
-      event->msg = isc_popqueue(scb->rd_msg_q);
       event->event = ISC_EVENT_MESSAGE;
       
       /* Move the session pointer to the next in the circular queue */
diff --git a/src/libraries/libisc-new/src/isc_queue.c b/src/libraries/libisc-new/src/isc_queue.c
index e2521a0b3de25559de54e6414dfa5c032740b5dc..9ef41e16d5abf64e8c8bbb00fa5128c0bef97870 100644
--- a/src/libraries/libisc-new/src/isc_queue.c
+++ b/src/libraries/libisc-new/src/isc_queue.c
@@ -30,12 +30,13 @@ isc_newqueue(void)
 
 
 /* Return TRUE if the queue is not empty. */
+#ifndef isc_pollqueue
 int
 isc_pollqueue(IscMsgQueue  * queue)
 {
   return queue != NULL && queue->head != NULL;
 }
-
+#endif
 
 void
 isc_killqueue(IscMsgQueue  * queue)