Index: source/ariba/overlay/messages/LinkRequest.h
===================================================================
--- source/ariba/overlay/messages/LinkRequest.h	(revision 4483)
+++ source/ariba/overlay/messages/LinkRequest.h	(revision 4618)
@@ -24,5 +24,5 @@
 private:
 	bool free_endpoint_;
-	uint8_t flags;
+	uint16_t flags; //TODO: was uint8_t
 	uint32_t nonce;
 	const EndpointDescriptor* endpoint;
Index: source/ariba/overlay/messages/OverlayMsg.h
===================================================================
--- source/ariba/overlay/messages/OverlayMsg.h	(revision 4483)
+++ source/ariba/overlay/messages/OverlayMsg.h	(revision 4618)
@@ -90,5 +90,5 @@
 
 private:
-	uint8_t type;
+	uint16_t type; //TODO: was uint8_t
 	ServiceID service;
 	NodeID sourceNode;
Index: source/ariba/overlay/modules/chord/messages/ChordMessage.h
===================================================================
--- source/ariba/overlay/modules/chord/messages/ChordMessage.h	(revision 4483)
+++ source/ariba/overlay/modules/chord/messages/ChordMessage.h	(revision 4618)
@@ -97,6 +97,6 @@
 
 private:
-	uint8_t type;
-	uint8_t hop_count;
+	uint16_t type; //TODO: was uint8_t
+	uint16_t hop_count; //TODO: was uint8_t
 	NodeID source, destination;
 };
Index: source/ariba/overlay/modules/chord/messages/Discovery.h
===================================================================
--- source/ariba/overlay/modules/chord/messages/Discovery.h	(revision 4483)
+++ source/ariba/overlay/modules/chord/messages/Discovery.h	(revision 4618)
@@ -108,6 +108,6 @@
 
 private:
-	uint8_t follow_type;
-	uint8_t ttl;
+	uint16_t follow_type; //TODO: was uint8_t
+	uint16_t ttl; //TODO: was uint8_t
 	EndpointDescriptor* source_endpoint;
 //	NodeEndpointList descriptors;
Index: source/ariba/overlay/modules/onehop/messages/OneHopMessage.h
===================================================================
--- source/ariba/overlay/modules/onehop/messages/OneHopMessage.h	(revision 4483)
+++ source/ariba/overlay/modules/onehop/messages/OneHopMessage.h	(revision 4618)
@@ -68,5 +68,5 @@
 
 private:
-	uint8_t type;
+	uint16_t type; // TODO: was uint8_t
 };