diff --git a/c_adlib/ad_kw/native/kwallets_rw.cpp b/c_adlib/ad_kw/native/kwallets_rw.cpp
index 4dc98cf0..ec4b9f65 100644
--- a/c_adlib/ad_kw/native/kwallets_rw.cpp
+++ b/c_adlib/ad_kw/native/kwallets_rw.cpp
@@ -137,13 +137,14 @@ using namespace KWallet;
 
 extern "C" 
 {
-        static struct EnumSecretList *tempEnumSecrets = NULL;
+    struct EnumSecretList *tempEnumSecrets = NULL;
 
 	//void MyTest(struct EnumSecretList *enumWalletSecrets)
 	void Aggregate(struct EnumSecretList *enumWalletSecrets)
 	{
 
          int retVal = 0;
+		 tempEnumSecrets = NULL;
          retVal = win->ReadAllWalletSecrets(&tempEnumSecrets);
 
          struct EnumSecretList *iter = tempEnumSecrets;
@@ -222,7 +223,7 @@ extern "C"
                 free(head);
                 head = temp;
           }
-          tempEnumSecrets = NULL;
+          
 
 
         }
diff --git a/vs_solutions/CASAInstall/CASA.ncb b/vs_solutions/CASAInstall/CASA.ncb
index de26e3fc..576b7ca5 100644
Binary files a/vs_solutions/CASAInstall/CASA.ncb and b/vs_solutions/CASAInstall/CASA.ncb differ
diff --git a/vs_solutions/CASAInstall/CASA.suo b/vs_solutions/CASAInstall/CASA.suo
index dcc87f78..574f28ff 100644
Binary files a/vs_solutions/CASAInstall/CASA.suo and b/vs_solutions/CASAInstall/CASA.suo differ
diff --git a/vs_solutions/CASAInstall/CASA.vdproj b/vs_solutions/CASAInstall/CASA.vdproj
index 55dffbe4..d185b604 100644
--- a/vs_solutions/CASAInstall/CASA.vdproj
+++ b/vs_solutions/CASAInstall/CASA.vdproj
@@ -21,18 +21,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_3CAF3E4AA1414321854A15D134838D7C"
-        "OwnerKey" = "8:_D1641051214046F78EDF37DC13C414ED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_898D92B8ADC241EE96B3B9E74FB3D5B4"
-        "OwnerKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -51,10 +39,22 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_E695D5B4BFB048FE83870D602AD8C055"
+        "OwnerKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_EF467E7BEF8E4109BAD7E2FE47508D13"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_F8091557496046BC8A74EE458A2B1E6F"
+        "OwnerKey" = "8:_D1641051214046F78EDF37DC13C414ED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -250,13 +250,13 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:CASA"
-        "ProductCode" = "8:{73BAA8CB-9BD1-4A6B-BDA8-D06261DE568E}"
-        "PackageCode" = "8:{F372BAF9-EB79-4F91-BA3B-02684578C17B}"
+        "ProductCode" = "8:{9C8295EC-79C6-4ED0-B78F-8D19E635FB81}"
+        "PackageCode" = "8:{F4D6480E-0942-4E2B-AE0E-C67F5DE39F92}"
         "UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
-        "ProductVersion" = "8:1.5.166"
+        "ProductVersion" = "8:1.5.167"
         "Manufacturer" = "8:Novell"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -730,7 +730,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_3CAF3E4AA1414321854A15D134838D7C"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_E695D5B4BFB048FE83870D602AD8C055"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
@@ -741,7 +741,7 @@
             "Feature" = "8:"
             "IsolateTo" = "8:"
             }
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_898D92B8ADC241EE96B3B9E74FB3D5B4"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_F8091557496046BC8A74EE458A2B1E6F"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
diff --git a/vs_solutions/CASAManager/CASAManager.suo b/vs_solutions/CASAManager/CASAManager.suo
index 89fadf89..2b5149db 100644
Binary files a/vs_solutions/CASAManager/CASAManager.suo and b/vs_solutions/CASAManager/CASAManager.suo differ