Index: source/ariba/communication/EndpointDescriptor.h
===================================================================
--- source/ariba/communication/EndpointDescriptor.h	(revision 4617)
+++ source/ariba/communication/EndpointDescriptor.h	(revision 4618)
@@ -100,5 +100,5 @@
 
 sznBeginDefault( ariba::communication::EndpointDescriptor, X ) {
-	uint8_t unspec = isUnspec;
+	uint16_t unspec = isUnspec; //TODO: was uint8_t
 
 	X && unspec && VO(locator);
Index: source/ariba/communication/messages/AribaBaseMsg.h
===================================================================
--- source/ariba/communication/messages/AribaBaseMsg.h	(revision 4617)
+++ source/ariba/communication/messages/AribaBaseMsg.h	(revision 4618)
@@ -85,5 +85,5 @@
 
 private:
-	uint8_t state;		// the link message type
+	uint16_t state;		// the link message type //TODO: was uint8_t
 	LinkID localLink;	// the local link id
 	LinkID remoteLink;	// the remote link id
@@ -94,6 +94,5 @@
 
 sznBeginDefault( ariba::communication::AribaBaseMsg, X ) {
-	uint8_t x = 0xff;
-	X && state && x && &localLink && &remoteLink && Payload();
+	X && state && &localLink && &remoteLink && Payload();
 } sznEnd();
 
Index: source/ariba/communication/modules/transport/tcp/TCPTransport.cpp
===================================================================
--- source/ariba/communication/modules/transport/tcp/TCPTransport.cpp	(revision 4617)
+++ source/ariba/communication/modules/transport/tcp/TCPTransport.cpp	(revision 4618)
@@ -203,10 +203,7 @@
 					// converting message
 					logging_debug( "converting message" );
-
-
-					std::cout << "XXXXXXXXXXXXreceived data on tcp transport: " << data << std::endl;
-
-
+					//std::cout << "XXXXXXXXXXXXreceived data on tcp transport: " << data << std::endl;
 					Message* msg = new Message(data);
+
 					std::ostringstream o;
 					o << (peer->get_ip_str() + 7) << ":" << remotePort;
@@ -243,10 +240,5 @@
 
 	Data data = data_serialize( message );
-
-
-	std::cout << "XXXXXXXXXXXXXsending out data using tcp transport: " << data << std::endl;
-
-
-
+	//std::cout << "XXXXXXXXXXXXXsending out data using tcp transport: " << data << std::endl;
 
 	const_cast<Message*>(message)->dropPayload();