diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index e203dc4..b1edd6f 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2033,7 +2033,7 @@
        show_ipv6_ripng_cmd,
        "show ipv6 ripng",
        SHOW_STR
-       IP_STR
+       IPV6_STR
        "Show RIPng routes\n")
 {
   struct route_node *rp;
@@ -2153,7 +2153,7 @@
        show_ipv6_ripng_status_cmd,
        "show ipv6 ripng status",
        SHOW_STR
-       IP_STR
+       IPV6_STR
        "Show RIPng routes\n"
        "IPv6 routing protocol process parameters and statistics\n")
 {
@@ -2603,7 +2603,7 @@
 DEFUN (show_ipv6_protocols, show_ipv6_protocols_cmd,
        "show ipv6 protocols",
        SHOW_STR
-       IP_STR
+       IPV6_STR
        "Routing protocol information")
 {
   if (! ripng)
diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c
index 572b7b9..59e5de1 100644
--- a/zebra/irdp_interface.c
+++ b/zebra/irdp_interface.c
@@ -411,6 +411,7 @@
 DEFUN (no_ip_irdp,
        no_ip_irdp_cmd,
        "no ip irdp",
+       NO_STR
        IP_STR
        "Disable ICMP Router discovery on this interface\n")
 {
@@ -445,6 +446,7 @@
 DEFUN (no_ip_irdp_shutdown,
        no_ip_irdp_shutdown_cmd,
        "no ip irdp shutdown",
+       NO_STR
        IP_STR
        "ICMP Router discovery no shutdown on this interface\n")
 {
@@ -628,6 +630,7 @@
 DEFUN (no_ip_irdp_address_preference,
        no_ip_irdp_address_preference_cmd,
        "no ip irdp address A.B.C.D preference <0-2147483647>",
+       NO_STR
        IP_STR
        "Alter ICMP Router discovery preference this interface\n"
        "Removes IRDP non-default preference\n"