diff --git a/include/tins/icmpv6.h b/include/tins/icmpv6.h
index 228bd83..914d852 100644
--- a/include/tins/icmpv6.h
+++ b/include/tins/icmpv6.h
@@ -80,14 +80,20 @@ public:
         NEIGHBOUR_SOLICIT = 135,
         NEIGHBOUR_ADVERT = 136,
         REDIRECT = 137,
-        ROUTER_RENUMBER = 137,
+        ROUTER_RENUMBER = 138,
         NI_QUERY = 139,
         NI_REPLY = 140,
         MLD2_REPORT = 143,
         DHAAD_REQUEST = 144,
         DHAAD_REPLY = 145,
-        MOBILE_PREFIX_SOL = 146,
-        MOBILE_PREFIX_ADV = 147
+        MOBILE_PREFIX_SOLICIT = 146,
+        MOBILE_PREFIX_ADVERT = 147,
+        CERT_PATH_SOLICIT = 148,
+        CERT_PATH_ADVERT = 149,
+        MULTICAST_ROUTER_ADVERT = 151,
+        MULTICAST_ROUTER_SOLICIT = 152,
+        MULTICAST_ROUTER_TERMINATE = 153,
+        RPL_CONTROL_MSG = 155
     };
     
     /**
diff --git a/include/tins/mpls.h b/include/tins/mpls.h
index 36a3fa3..9da8419 100644
--- a/include/tins/mpls.h
+++ b/include/tins/mpls.h
@@ -40,9 +40,10 @@ namespace Tins {
 class ICMPExtension;
 
 /**
+ * \class MPLS
  * \brief Represents an MPLS PDU
  */
-class MPLS : public PDU {
+class TINS_API MPLS : public PDU {
 public:
     /**
      * \brief This PDU's flag.
diff --git a/include/tins/pdu_cacher.h b/include/tins/pdu_cacher.h
index ebab9b1..714ef98 100644
--- a/include/tins/pdu_cacher.h
+++ b/include/tins/pdu_cacher.h
@@ -53,7 +53,7 @@ namespace Tins {
  * etc.
  */
 template <typename T>
-class PDUCacher : public PDU {
+class TINS_API PDUCacher : public PDU {
 public:
     /**
      * The cached PDU type.
diff --git a/include/tins/udp.h b/include/tins/udp.h
index 9badf83..5217751 100644
--- a/include/tins/udp.h
+++ b/include/tins/udp.h
@@ -60,7 +60,7 @@ namespace Tins {
  *
  * \sa RawPDU
  */
-class UDP : public PDU {
+class TINS_API UDP : public PDU {
 public:
     /**
      * \brief This PDU's flag.
diff --git a/src/ip_address.cpp b/src/ip_address.cpp
index 8177376..d876914 100644
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -109,7 +109,7 @@ ostream& operator<<(ostream& output, const IPv4Address& addr) {
         }
         mask -= 8;
     }
-    return output;;
+    return output;
 }
 
 bool IPv4Address::is_private() const {