diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 95f733b436..a2016df379 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,13 +16,20 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-25 16:39 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbnetio/utils/netiosrv/netiosrv.prg
+    * Minors.
+
+  * contrib/hbnetio/utils/netiosrv/netiocmd.prg
+    - Deleted now completed TODO items.
+
 2011-01-25 15:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbnetio/utils/netiosrv/netiosrv.prg
     * Eliminated netio_srvSocket() call.
     + Displaying bytes sent and received.
     + Displaying connection status.
     ; TOFIX: NETIO_SRVINFO_PEERADDRESS doesn't seem to work, returning NIL (or nothing),
-             it's possible I'm missing something.
+             it's possible I'm missing something. [DONE - full rebuild fixed it]
 
 2011-01-25 15:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbnetio/utils/netiosrv/netiosrv.hbp
@@ -38,7 +45,7 @@
   * contrib/hbnetio/netiosrv.c
     - Deleted: NETIO_OPENFILESCOUNT().
     ; TODO: Pls update netiosrq to use the new interface.
-            Same for netiosrv. I'll do it in next commit.
+            Same for netiosrv [DONE]. I'll do it in next commit.
 
   * contrib/hbnetio/hbnetio.ch
     ! Added notice that this .ch file is used also by .c code.
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/netiocmd.prg b/harbour/contrib/hbnetio/utils/netiosrv/netiocmd.prg
index d4a3375b6d..96e327d062 100644
--- a/harbour/contrib/hbnetio/utils/netiosrv/netiocmd.prg
+++ b/harbour/contrib/hbnetio/utils/netiosrv/netiocmd.prg
@@ -27,13 +27,8 @@ FUNCTION hbnetiosrv_LoadCmds( bQuit, bShowInfo )
    RETURN hCmds
 
 /* TODO: - on the fly change of RPC filter modules
-         - listing active connections
          - listing open files
          - listing active locks
-         - activity meters (transferred bytes, bandwidth, etc)
-         - showing number of connections
-         - showing number of open files
-         - listing transferred bytes
          - gracefully shutting down server by waiting for connections to close and not accept new ones
          - pausing server */
 
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.prg b/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.prg
index beb7a78353..c885488414 100644
--- a/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.prg
+++ b/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.prg
@@ -346,7 +346,7 @@ STATIC FUNCTION ConnStatusStr( nStatus )
    CASE NETIO_SRVSTAT_ITEMSTREAM  ; RETURN "ITEMSTREAM"
    ENDSWITCH
 
-   RETURN "UNKNOWN"
+   RETURN "UNKNOWN:" + hb_ntos( nStatus )
 
 STATIC FUNCTION AddrToIPPort( aAddr )
    LOCAL cIP
@@ -356,7 +356,7 @@ STATIC FUNCTION AddrToIPPort( aAddr )
         aAddr[ HB_SOCKET_ADINFO_FAMILY ] == HB_SOCKET_AF_INET6 )
       cIP := aAddr[ HB_SOCKET_ADINFO_ADDRESS ] + ":" + hb_ntos( aAddr[ HB_SOCKET_ADINFO_PORT ] )
    ELSE
-      cIP := ""
+      cIP := "(?)"
    ENDIF
 
    RETURN cIP