--- a/featuremgmt/featuremgr/src/serverexe/featmgrserver.cpp	Fri Mar 19 10:00:55 2010 +0200
+++ b/featuremgmt/featuremgr/src/serverexe/featmgrserver.cpp	Fri Apr 16 16:49:27 2010 +0300
@@ -226,7 +226,6 @@
         } 
     
     delete iTimer;
-    iFs.Close();
     iPluginList.Close();
     
     // De register Backup and Restore and cleanup memory
@@ -239,6 +238,7 @@
     	}
     
     delete iRegistry;
+    iFs.Close();
     }
 
 
@@ -528,7 +528,7 @@
         {
         if ( iPluginList[i].iPluginHandler == aPluginHandler )
             {
-            iRegistry->MergePluginFeatures( aFeatureList );
+            iRegistry->MergePluginFeaturesL( aFeatureList );
             // Send command to load enhanced feature info
             TRAPD( err, iPluginList[i].iPluginHandler->SendCommandL( 
                 FeatureInfoCommand::ELoadEnhancedFeatureInfoCmdId ) );
@@ -572,7 +572,7 @@
         {
         if ( iPluginList[i].iPluginHandler == aPluginHandler )
             {
-            iRegistry->MergePluginFeatures( aFeatureList );
+            iRegistry->MergePluginFeaturesL( aFeatureList );
             // Send another command if something left to process
             iPluginList[i].iPluginReady = ETrue;
             }
@@ -820,8 +820,6 @@
 void CFeatMgrServer::HandleRestoredNotificationsL( void )
 	{
 	iRegistry->HandleRestoredFeatureNotificationsL();
-	
-	return;
 	}
 
 /**