--- a/src/common/packet-tag-list.h	Fri Mar 20 14:30:36 2009 +0100
+++ b/src/common/packet-tag-list.h	Mon Mar 23 15:20:15 2009 +0100
@@ -34,7 +34,7 @@
  * The maximum size (in bytes) of a Tag is stored
  * in this constant.
  */
-#define PACKET_TAG_MAX_SIZE 16
+#define PACKET_TAG_MAX_SIZE 20
 
 class PacketTagList 
 {

--- a/src/node/address.h	Fri Mar 20 14:30:36 2009 +0100
+++ b/src/node/address.h	Mon Mar 23 15:20:15 2009 +0100
@@ -91,7 +91,7 @@
    * can be stored in an Address instance.
    */
   enum MaxSize_e {
-    MAX_SIZE = 30
+    MAX_SIZE = 20
   };
 
   /**