diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index d76ac961cdc6f41362e6e44abf502c8e8d2c17f6..5bc03881a60274207202715eabb6327f9f342d10 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -4207,7 +4207,7 @@ module OneM2M_Testcases {
                     var integer v_resourceIndex := -1;
                     
                                 
-                    v_request := m_retrieveResource(f_getResourceAddress(-2) & "/" & v_resourceId);
+                    v_request := valueof(m_retrieveResource(f_getResourceAddress(-2) & "/" & v_resourceId));
                     v_request.primitiveContent.any_1[0].Group_optional.fanOutPoint := c_fanoutPointAddress;
                                                     
                     
@@ -4269,7 +4269,6 @@ module OneM2M_Testcases {
                     var template RequestPrimitive v_createRequest := m_createGroupBase;
                     var template RequestPrimitive v_updateRequest := m_updateGroupBase;
                             
-                    var  Group_optional v_group_optional;
                     v_updateRequest.primitiveContent.any_1[0].Group_optional.fanOutPoint := c_fanoutPointAddress;
                     
                                     
diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index d7cbf7d550f362644f507f028d945e7d1684d414..2f5ba92686ce06768f0f71b4c939211d95208398 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -4614,5 +4614,5 @@ with {
   encode "XML";
   variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'";
   variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
-  extension "anytype ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, ContentInstance_update_invalid, Group_optional, Group_update_invalid, Schedule_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid"
+  extension "anytype ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, ContentInstance_update_invalid, Group_optional, Group_update_invalid, Schedule_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid"
 }