diff --git a/net/icmpv6/icmpv6_input.c b/net/icmpv6/icmpv6_input.c
index 385ca260d1..81a408b890 100644
--- a/net/icmpv6/icmpv6_input.c
+++ b/net/icmpv6/icmpv6_input.c
@@ -83,7 +83,7 @@
 #define ICMPv6RADVERTISE \
   ((struct icmpv6_router_advertise_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN])
 
-#define MLDQUEURY \
+#define MLDQUERY \
   ((FAR struct mld_mcast_listen_query_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN])
 #define MLDREPORT_V1 \
   ((FAR struct mld_mcast_listen_report_v1_s *)&dev->d_buf[NET_LL_HDRLEN(dev) + IPv6_HDRLEN])
@@ -247,6 +247,11 @@ void icmpv6_input(FAR struct net_driver_s *dev)
   g_netstats.icmpv6.recv++;
 #endif
 
+  /* REVISIT:
+   * - Verify that the message length is valid.
+   * - Verify the ICMPv6 checksum
+   */
+
   /* Handle the ICMPv6 message by its type */
 
   switch (ipicmp->type)
@@ -490,7 +495,7 @@ void icmpv6_input(FAR struct net_driver_s *dev)
 
     case ICMPV6_MCAST_LISTEN_QUERY:      /* Multicast Listener Query, RFC 2710 and RFC 3810 */
       {
-        FAR struct mld_mcast_listen_query_s *query = MLDQUEURY;
+        FAR struct mld_mcast_listen_query_s *query = MLDQUERY;
         int ret;
 
         ret = mld_query_input(dev, query);
diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c
index a5c19b8030..b0995d0bea 100644
--- a/net/igmp/igmp_input.c
+++ b/net/igmp/igmp_input.c
@@ -216,7 +216,7 @@ void igmp_input(struct net_driver_s *dev)
               }
             else /* if (IGMPBUF->grpaddr != 0) */
               {
-                ninfo("Group-specific multicast queury\n");
+                ninfo("Group-specific multicast query\n");
 
                 /* We first need to re-lookup the group since we used dest last time.
                  * Use the incoming IPaddress!