diff --git a/common/utils/telnetsrv/telnetsrv.c b/common/utils/telnetsrv/telnetsrv.c
index 7bbb40d5d8..9e4eeca205 100644
--- a/common/utils/telnetsrv/telnetsrv.c
+++ b/common/utils/telnetsrv/telnetsrv.c
@@ -688,17 +688,18 @@ void run_telnetclt(void) {
   inet_aton("127.0.0.1", &addr) ;
   name.sin_addr.s_addr = addr.s_addr;   
   name.sin_port = htons((unsigned short)(telnetparams.listenport));
-
-  sock = socket(AF_INET, SOCK_STREAM, 0);
-  if (sock < 0)
-    fprintf(stderr,"[TELNETSRV] Error %s on socket call\n",strerror(errno));  
-  if(connect(sock, (void *) &name, sizeof(name)))
-    fprintf(stderr,"[TELNETSRV] Error %s on connect call\n",strerror(errno));
- 
-  struct timeval ts;
-  ts.tv_sec = 1; // 1 second
-  ts.tv_usec = 0;
   while (1) {
+    sock = socket(AF_INET, SOCK_STREAM, 0);
+    if (sock < 0)
+      fprintf(stderr,"[TELNETSRV] Error %s on socket call\n",strerror(errno));
+
+    if(connect(sock, (void *) &name, sizeof(name)))
+      fprintf(stderr,"[TELNETSRV] Error %s on connect call\n",strerror(errno));
+ 
+    struct timeval ts;
+    ts.tv_sec = 1; // 1 second
+    ts.tv_usec = 0;
+    while (1) {
       fd_set fds;   
       FD_ZERO(&fds);
       FD_SET(sock, &fds);
@@ -740,8 +741,9 @@ void run_telnetclt(void) {
           }
         free(inbuf); 
       }
-  }
-  close(sock);
+    }
+    close(sock);
+    }
   return;
 } /* run_telnetclt */
 
diff --git a/common/utils/telnetsrv/telnetsrv_measurements.c b/common/utils/telnetsrv/telnetsrv_measurements.c
index 8e1e8ecbd7..786cbd094c 100644
--- a/common/utils/telnetsrv/telnetsrv_measurements.c
+++ b/common/utils/telnetsrv/telnetsrv_measurements.c
@@ -162,7 +162,7 @@ int measurcmd_show(char *buf, int debug, telnet_printfunc_t prnt) {
                 notifiedFIFO_elt_t *msg =newNotifiedFIFO_elt(sizeof(time_stats_msg_t),0,NULL,NULL);
                 time_stats_msg_t *msgdata=NotifiedFifoData(msg);
                 msgdata->msgid = TIMESTAT_MSGID_DISPLAY;
-                msgdata->displayFunc = (void (*)(void *))prnt;
+                msgdata->displayFunc = prnt;
                 pushNotifiedFIFO(&measur_fifo, msg);
     } else if ( strcmp(subcmd,"groups") == 0){
       measurcmd_display_groups(prnt,measurgroups,num_measurgroups);