diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index a7ec63b73a848d3d9100201a032431c09918c71e..65c28d7833917a14b11396c08b809346d47afe03 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1539,8 +1539,10 @@ module OneM2M_Functions {
 						if(vc_ae1.alive) {
 							f_cse_postamble_ae1();
 						}
-						if(vc_cse2.alive) {
-							vc_cse2.stop;
+						if(vc_auxiliaryCse2Up) {
+							if(vc_cse2.alive) {
+								vc_cse2.stop;
+							}
 						}
 					};
 		
@@ -2612,7 +2614,7 @@ module OneM2M_Functions {
 					if(p_resourceType == int10002) {
 						if(ischosen(p_requestPrimitive.primitiveContent.aEAnnc)) {
 							if(valueof(p_requestPrimitive.primitiveContent.aEAnnc.link) == "S") {
-								p_requestPrimitive.primitiveContent.aEAnnc.link := f_getLocalResourceAddress() & "S"; 
+								p_requestPrimitive.primitiveContent.aEAnnc.link := f_getLocalResourceAddress() & "/" & "S"; 
 							} else {
 								v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentAe(m_contentCreateAe(omit, -, PX_TS_AE1.appId,omit)), -, int2);
 								p_requestPrimitive.primitiveContent := f_setLink(valueof(p_requestPrimitive.primitiveContent), f_getLocalResourceAddress(v_originalResourceIndex));
@@ -5284,8 +5286,9 @@ module OneM2M_Functions {
             v_poa := v_poa & ":" & int2str(p_portDesc.binding.wsBindingDesc.bindingDesc.localPort);
         }
       }
+      if(p_announcementTargetResource != "") {
 			v_poa := v_poa & "/" & p_announcementTargetResource;
-			
+      }
 			return v_poa;
 		}