diff --git a/nping/NpingTarget.cc b/nping/NpingTarget.cc
index f08ecac28..d40cde3ed 100644
--- a/nping/NpingTarget.cc
+++ b/nping/NpingTarget.cc
@@ -353,7 +353,7 @@ struct in6_addr NpingTarget::getIPv6SourceAddress() {
 /** Returns IPv6 host address or NULL if unavailable.*/
 const struct in6_addr *NpingTarget::getIPv6SourceAddress_aux() {
   struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) &sourcesock;
-  if (sin6->sin6_family == AF_INET) {
+  if (sin6->sin6_family == AF_INET6) {
     return &(sin6->sin6_addr);
   }
   return NULL;
@@ -366,7 +366,7 @@ u8 *NpingTarget::getIPv6SourceAddress_u8(){
     return NULL;
   else
     return (u8*)in->s6_addr;
-} /* End of getIPv6Address_u8() */
+} /* End of getIPv6SourceAddress_u8() */
 
 
 /** If the host is directly connected on a network, set and retrieve
diff --git a/nping/ProbeMode.cc b/nping/ProbeMode.cc
index af83755cf..9bf2a8be5 100644
--- a/nping/ProbeMode.cc
+++ b/nping/ProbeMode.cc
@@ -1001,7 +1001,7 @@ int ProbeMode::fillPacketICMP(NpingTarget *target, u8 *buff, int bufflen, int *f
         break;
     }
 
-    /* Fill the IPv4Header object with the info from NpingOps */
+    /* Fill the IPv6Header object with the info from NpingOps */
     createIPv6(&i6, &c6, "ICMPv6", target);
 
     /* Compute checksum */