diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index fc47358de64057981a9af979ef2678bec1138b79..5f4e87b94da2958d436c73b607c6207cf61ae204 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -5675,7 +5675,7 @@ module OneM2M_Functions {
 						}
 					}
 					case ("MqttSetDefaultTopicToNotRegistration") {
-						acPort.send(AcRequestPrimitive:{p_event, {charstring := oct2char(unichar2oct(p_originator))}});
+						acPort.send(AcRequestPrimitive:{p_event, {charstring := oct2char(unichar2oct(valueof(p_originator)))}});
 					}
 					case ("MqttSetDefaultTopicToRegistration") {
 						acPort.send(AcRequestPrimitive:{p_event, {charstring := int2str(p_resourceIndex)}});
@@ -6001,7 +6001,7 @@ module OneM2M_Functions {
 			p_msgOut.serialization := vc_myInterfaces[enum2int(p_interfaceIds)].mySerialization;
 			log("f_send: protocolBinding=", p_msgOut.protocolBinding);
 			if(ischosen(p_msgOut.primitive.requestPrimitive)){
-				p_msgOut.primitive.requestPrimitive.requestIdentifier := p_msgOut.primitive.requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+				p_msgOut.primitive.requestPrimitive.requestIdentifier := valueof(p_msgOut.primitive.requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 				vc_request.primitive.requestPrimitive := valueof(p_msgOut.primitive.requestPrimitive);
 			}
 			if(not(vc_componentRegistered)) {
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index d5bb3d0029d90aae8e4961173a19b045ef1a4adb..626736e00ca0d15d8bc366f5611ea14f9f5db13a 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit d5bb3d0029d90aae8e4961173a19b045ef1a4adb
+Subproject commit 626736e00ca0d15d8bc366f5611ea14f9f5db13a