diff --git a/isisd/isis_misc.c b/isisd/isis_misc.c
index cf558e8..1f19606 100644
--- a/isisd/isis_misc.c
+++ b/isisd/isis_misc.c
@@ -63,7 +63,7 @@
       sprintf ( pos, "%02x", *(from + i));
       pos += 2;
     } else {
-      if (i == 0) { /* if the area addr is just one byte, eg. 47. */
+      if (i == (len - 1)) { /* No dot at the end of address */
         sprintf ( pos, "%02x", *(from + i));
         pos += 2;
       } else {
@@ -187,6 +187,15 @@
     case NLPID_IPV6:
       pos += sprintf (pos, "IPv6");
       break;
+    case NLPID_SNAP:
+      pos += sprintf (pos, "SNAP");
+      break;
+    case NLPID_CLNP:
+      pos += sprintf (pos, "CLNP");
+      break;
+    case NLPID_ESIS:
+      pos += sprintf (pos, "ES-IS");
+      break;
     default:
       pos += sprintf (pos, "unknown");
       break;