diff -r 1e03af4311bd src/network/model/address.cc
--- a/src/network/model/address.cc	Tue Oct 21 16:14:35 2014 -0700
+++ b/src/network/model/address.cc	Tue Dec 06 10:28:25 2016 -0800
@@ -151,7 +151,7 @@
 }
 
 void
-Address::Serialize (TagBuffer buffer) const
+Address::Serialize (TagBuffer &buffer) const
 {
   NS_LOG_FUNCTION (this << &buffer);
   buffer.WriteU8 (m_type);
@@ -160,7 +160,7 @@
 }
 
 void
-Address::Deserialize (TagBuffer buffer)
+Address::Deserialize (TagBuffer &buffer)
 {
   NS_LOG_FUNCTION (this << &buffer);
   m_type = buffer.ReadU8 ();
@@ -169,7 +169,7 @@
   buffer.Read (m_data, m_len);
 }
 
-ATTRIBUTE_HELPER_CPP (Address);   //!< Macro to make help make class an ns-3 attribute
+ATTRIBUTE_HELPER_CPP (Address);
 
 
 bool operator == (const Address &a, const Address &b)
diff -r 1e03af4311bd src/network/model/address.h
--- a/src/network/model/address.h	Tue Oct 21 16:14:35 2014 -0700
+++ b/src/network/model/address.h	Tue Dec 06 10:28:25 2016 -0800
@@ -216,13 +216,13 @@
    *
    * \param buffer output buffer that gets written with this Address
    */
-  void Serialize (TagBuffer buffer) const;
+  void Serialize (TagBuffer &buffer) const;
   /**
    * \param buffer buffer to read address from
    * 
    * The input address buffer is expected to be in host byte order format.
    */
-  void Deserialize (TagBuffer buffer);
+  void Deserialize (TagBuffer &buffer);
 
 private:
   /**