--- a/multimediacommscontroller/mmccjitterbuffer/group/jitterbuffer.mmp	Wed Jul 28 17:16:27 2010 +0300
+++ b/multimediacommscontroller/mmccjitterbuffer/group/jitterbuffer.mmp	Fri Aug 06 15:42:13 2010 +0300
@@ -46,6 +46,6 @@
 LIBRARY         ecom.lib
 LIBRARY         mmfcontrollerframework.lib
 LIBRARY         mmfserverbaseclasses.lib
-LIBRARY         errorconcealmentintfc.lib
+LIBRARY         ErrorConcealmentIntfc.lib
 
 PAGED

--- a/multimediacommscontroller/mmccsubcontroller/group/subcontroller.mmp	Wed Jul 28 17:16:27 2010 +0300
+++ b/multimediacommscontroller/mmccsubcontroller/group/subcontroller.mmp	Fri Aug 06 15:42:13 2010 +0300
@@ -82,15 +82,15 @@
 LIBRARY     insock.lib
 LIBRARY     3gpmp4lib.lib
 LIBRARY     efsrv.lib
-LIBRARY     speechencoderconfig.lib
-LIBRARY	    errorconcealmentintfc.lib
-LIBRARY     audiooutputrouting.lib
-LIBRARY     g711decoderintfc.lib
-LIBRARY     g711encoderintfc.lib
-LIBRARY     g729decoderintfc.lib
-LIBRARY     g729encoderintfc.lib
-LIBRARY     ilbcdecoderintfc.lib
-LIBRARY     ilbcencoderintfc.lib
+LIBRARY     SpeechEncoderConfig.lib
+LIBRARY	    ErrorConcealmentIntfc.lib
+LIBRARY     AudioOutputRouting.lib
+LIBRARY     G711DecoderIntfc.lib
+LIBRARY     G711EncoderIntfc.lib
+LIBRARY     G729DecoderIntfc.lib
+LIBRARY     G729EncoderIntfc.lib
+LIBRARY     IlbcDecoderIntfc.lib
+LIBRARY     IlbcEncoderIntfc.lib
 LIBRARY     srtp.lib
 // Other MCC libraries
 LIBRARY     mmccjitterbuffer.lib

--- a/multimediacommsengine/mmcesrv/group/mceserver.mmp	Wed Jul 28 17:16:27 2010 +0300
+++ b/multimediacommsengine/mmcesrv/group/mceserver.mmp	Fri Aug 06 15:42:13 2010 +0300
@@ -223,7 +223,7 @@
 LIBRARY     esock.lib
 LIBRARY     bafl.lib
 LIBRARY     estor.lib
-LIBRARY     commonengine.lib
+LIBRARY     CommonEngine.lib
 LIBRARY     commdb.lib 
 LIBRARY     charconv.lib
 LIBRARY     sipclient.lib

--- a/multimediacommsengine/mmcesrv/mmceserver/src/mcesipconnection.cpp	Wed Jul 28 17:16:27 2010 +0300
+++ b/multimediacommsengine/mmcesrv/mmceserver/src/mcesipconnection.cpp	Fri Aug 06 15:42:13 2010 +0300
@@ -623,6 +623,8 @@
             session->Canceled();
             }
         }
+    
+    iSessionManager.Cleanup();
     MCESRV_DEBUG("CMceSipConnection::ConnectionStateChanged, Exit")
     }
 

--- a/natplugins/natpcliprovisioningnatfwadapter/group/wpnatfwtraversaladapter.mmp	Wed Jul 28 17:16:27 2010 +0300
+++ b/natplugins/natpcliprovisioningnatfwadapter/group/wpnatfwtraversaladapter.mmp	Fri Aug 06 15:42:13 2010 +0300
@@ -55,7 +55,7 @@
 USERINCLUDE     ../loc
 
 LIBRARY        	euser.lib 
-LIBRARY	        ProvisioningEngine.lib
+LIBRARY	        provisioningengine.lib
 LIBRARY         centralrepository.lib
 LIBRARY         charconv.lib
 LIBRARY         cmmanager.lib