Index: source/ariba/utility/types/Identifier.h
===================================================================
--- source/ariba/utility/types/Identifier.h	(revision 4614)
+++ source/ariba/utility/types/Identifier.h	(revision 4618)
@@ -569,29 +569,18 @@
 /* serializers */
 sznBeginDefault( ariba::utility::Identifier, X ) {
+
 	// calculate length of key
 	uint16_t len = array_size*sizeof(mp_limb_t);
-	uint8_t unspec = isUnspec;
+	uint16_t unspec = isUnspec; //TODO: was uint8_t
 
 	// only serialize the lower 16 bits of keyLength
 	X && unspec && len;
 
-	/*
-	if (X.isDeserializer()){
-		if(len != array_size*sizeof(mp_limb_t)){
-			std::cout << "len: " << len << ", array_size: "
-				<< array_size << ", sizeof(mp_limb_t): " << sizeof(mp_limb_t) << std::endl;
-			assert(false);
-		}
-	}
-	*/
-
 	// serialize the identifier
 	for (int i=array_size-1; i>=0; i--) X && key[i];
 
-	// when deserializing reset unspec flag
+	// when deserializing set unspec flag
 	if (X.isDeserializer()){
-		//isUnspec = unspec;
-		isUnspec = false;
-		//std::cout << "isUnspec: " << (isUnspec ? "true" : "false") << "   " << "unspec: " << (int)unspec << std::endl;
+		isUnspec = unspec;
 	}
 
Index: source/ariba/utility/types/OverlayParameterSet.h
===================================================================
--- source/ariba/utility/types/OverlayParameterSet.h	(revision 4614)
+++ source/ariba/utility/types/OverlayParameterSet.h	(revision 4618)
@@ -64,5 +64,5 @@
 
 private:
-	uint8_t structure;
+	uint16_t structure; //TODO: was uint8_t
 
 };