Index: source/ariba/utility/types/Identifier.h
===================================================================
--- source/ariba/utility/types/Identifier.h	(revision 4622)
+++ source/ariba/utility/types/Identifier.h	(revision 4625)
@@ -572,5 +572,5 @@
 	// calculate length of key
 	uint16_t len = array_size*sizeof(mp_limb_t);
-	uint16_t unspec = isUnspec; //TODO: was uint8_t
+	uint8_t unspec = isUnspec;
 
 	// only serialize the lower 16 bits of keyLength
Index: source/ariba/utility/types/OverlayParameterSet.h
===================================================================
--- source/ariba/utility/types/OverlayParameterSet.h	(revision 4622)
+++ source/ariba/utility/types/OverlayParameterSet.h	(revision 4625)
@@ -64,5 +64,5 @@
 
 private:
-	uint16_t structure; //TODO: was uint8_t
+	uint8_t structure;
 
 };