--- a/omads/omadsappui/AspSyncUtil/inc/AspPreSyncPluginInterface.h	Wed Mar 31 21:14:07 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/inc/AspPreSyncPluginInterface.h	Wed Apr 14 15:45:46 2010 +0300
@@ -112,7 +112,7 @@
 		* Instantiates a PCS plug-in, knowing the implementation uid.
 		* @param aImpUid imp uID
 		*/
-		CPreSyncPlugin* InstantiatePlugInFromImpUidLC( const TUid& aImpUid );
+		CPreSyncPlugin* InstantiatePlugInFromImpUidL( const TUid& aImpUid );
 
 
 	private: 

--- a/omads/omadsappui/AspSyncUtil/src/AspPreSyncPluginInterface.cpp	Wed Mar 31 21:14:07 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/src/AspPreSyncPluginInterface.cpp	Wed Apr 14 15:45:46 2010 +0300
@@ -17,6 +17,7 @@
 
 
 // INCLUDE FILES
+#include <nsmlconstants.h>
 #include "AspPreSyncPluginInterface.h"
 #include "CPreSyncPlugin.h"
 
@@ -96,15 +97,18 @@
     CPreSyncPlugin* syncPlugin = NULL;
     CPreSyncPlugin* defaultSyncPlugin = NULL;
 
+	CleanupRImplInfoPtrArrayPushL( &infoArray );
+
     // Get list of all implementations
     TRAPD(error, ListAllImplementationsL( infoArray ));
     
     if (error != KErrNone)
         {
+		CleanupStack::PopAndDestroy( &infoArray );
         return NULL;
         }
     // Instantiate plugins for all impUIds by calling 
-    // InstantiatePlugInFromImpUidLC
+    // InstantiatePlugInFromImpUidL
     for ( TInt i=0; i<infoArray.Count(); i++ )
         {
         // Get imp info
@@ -116,12 +120,12 @@
         if ( info.DisplayName().Compare(kDefault) == 0 )
             {			
 	        //instantiate plugin for impUid
-	        defaultSyncPlugin = InstantiatePlugInFromImpUidLC( impUid );
-	        defaultSyncPlugin->SetProfile(aProfileId);
+	        defaultSyncPlugin = InstantiatePlugInFromImpUidL( impUid );
+			defaultSyncPlugin->SetProfile(aProfileId);
             }
 		else
 		    {
-			syncPlugin = InstantiatePlugInFromImpUidLC( impUid );
+			syncPlugin = InstantiatePlugInFromImpUidL( impUid );
 			syncPlugin->SetProfile(aProfileId);
 			if(syncPlugin->IsSupported())
 			    {
@@ -130,23 +134,25 @@
 			    }
 			else
 			    {
-			    CleanupStack::PopAndDestroy(syncPlugin);
+                delete syncPlugin;
 			    }
 		    }
         }
 
-    infoArray.ResetAndDestroy();
+    CleanupStack::PopAndDestroy( &infoArray );
 	if(bHandleSync)
 	{		
 		//delete defaultSyncPlugin;
 	    if(defaultSyncPlugin != NULL)
 	    {
-	    CleanupStack::PopAndDestroy(defaultSyncPlugin);
+	    delete defaultSyncPlugin;
 	    }
+	    CleanupStack::PushL(syncPlugin);
 		return syncPlugin;
 	}
 	else
-	{
+	{      
+        CleanupStack::PushL(defaultSyncPlugin);
 		return defaultSyncPlugin;
 	}    
  }
@@ -161,14 +167,13 @@
 }
 
 // ----------------------------------------------------------------------------
-// CPreSyncPluginInterface::InstantiatePlugInFromImpUidLC
+// CPreSyncPluginInterface::InstantiatePlugInFromImpUidL
 // Instantiates plugin
 // ---------------------------------------------------------------------------- 
-CPreSyncPlugin* CPreSyncPluginInterface::InstantiatePlugInFromImpUidLC( const TUid& aImpUid )
+CPreSyncPlugin* CPreSyncPluginInterface::InstantiatePlugInFromImpUidL( const TUid& aImpUid )
 {    
    // REComSession
     CPreSyncPlugin *preSyncPlugin = CPreSyncPlugin::NewL(aImpUid);    
-    CleanupStack::PushL(preSyncPlugin);
     return preSyncPlugin;
 }
     

--- a/omads/omadsappui/AspSyncUtil/src/AspSyncUtil.cpp	Wed Mar 31 21:14:07 2010 +0300
+++ b/omads/omadsappui/AspSyncUtil/src/AspSyncUtil.cpp	Wed Apr 14 15:45:46 2010 +0300
@@ -421,14 +421,7 @@
     	ret = EFalse;
 		}
 		
-	else if (profileList->Count() == 1)
-		{
-		TAspProfileItem& item = profileList->Item(0);
-		aProfileId = item.iProfileId;
-		aTaskId = item.iTaskId;
-       	ret = ETrue;
-		}
-		
+			
 	else
 		{
 		if(aCheckId)

--- a/omads/omadsextensions/dsutils/nsmldefaultagendahandler/src/nsmldefaultagendahandlerplugin.cpp	Wed Mar 31 21:14:07 2010 +0300
+++ b/omads/omadsextensions/dsutils/nsmldefaultagendahandler/src/nsmldefaultagendahandlerplugin.cpp	Wed Apr 14 15:45:46 2010 +0300
@@ -332,8 +332,10 @@
         if( agendautil->iName != NULL )
             {
             calinfo->SetNameL( agendautil->iName->Des() );
-            TRAP( err, calsession->CreateCalFileL( agendautil->iName->Des(), *calinfo ) );
-            }
+			HBufC* calfilename = CCalenMultiCalUtil::GetNextAvailableCalFileL();
+            TRAP( err, calsession->CreateCalFileL( *calfilename, *calinfo ) );
+			delete calfilename;
+			}
         else
             {
             err = KErrNotFound;