--- a/uiservicetab/vimpstengine/inc/cvimpstenginesessioncntxtobserver.h	Fri Mar 19 15:17:07 2010 -0700
+++ b/uiservicetab/vimpstengine/inc/cvimpstenginesessioncntxtobserver.h	Fri Mar 19 16:56:51 2010 -0700
@@ -68,7 +68,7 @@
 		 * @return CVIMPSTEngineSessionCntxtObserver new instance of this class
 	 	 */
 		static CVIMPSTEngineSessionCntxtObserver* 
-							CVIMPSTEngineSessionCntxtObserver::NewL(TUint32 aServiceId);
+							NewL(TUint32 aServiceId);
         /**
 	     * Two-phased constructor.
 	     * @param aSettingsId: settings id.
@@ -76,7 +76,7 @@
 		 * @return CVIMPSTEngineSessionCntxtObserver new instance of this class
 	 	 */							
 	    static CVIMPSTEngineSessionCntxtObserver* 
-	    					CVIMPSTEngineSessionCntxtObserver::NewLC(TUint32 aServiceId);
+	    				NewLC(TUint32 aServiceId);
 	    
 	    
 	   /**

--- a/uiservicetab/vimpststorage/inc/cvimpststoragemanager.h	Fri Mar 19 15:17:07 2010 -0700
+++ b/uiservicetab/vimpststorage/inc/cvimpststoragemanager.h	Fri Mar 19 16:56:51 2010 -0700
@@ -91,7 +91,7 @@
         static CVIMPSTStorageManager* NewL();
         
         // ConstructL
-        void CVIMPSTStorageManager::ConstructL();
+        void ConstructL();
   
        
     private:

--- a/uiservicetabsettings/src/rvimpstsettingsreleasearray.cpp	Fri Mar 19 15:17:07 2010 -0700
+++ b/uiservicetabsettings/src/rvimpstsettingsreleasearray.cpp	Fri Mar 19 16:56:51 2010 -0700
@@ -32,6 +32,6 @@
 void RVIMPSTSettingsReleaseArray::Close()
 	{
 	ResetAndDestroy();
-	RPointerArray::Close();
+	RPointerArray< HBufC >::Close();
 	}