diff --git a/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj b/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj
index 8ffcc127..22704877 100644
--- a/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj
+++ b/CASA-auth-token/non-java/client/authtokenclient_msm/authtokenclient_msm.vdproj
@@ -33,6 +33,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_14879C6DA33C4224AD56983018EDC817"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_1ED6B3F7C91A4BBE875FC4621FC3CD97"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -45,12 +51,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_313DE095D13281AF91A64E3F3D472413"
-        "OwnerKey" = "8:_9A2FC85FE99C48E8AD1E4813BE33A03A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_409269C4EABE4CC18045A808B7B1C104"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -63,8 +63,20 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_7A0B81639B6D4DB1839306A9290BDE2D"
-        "OwnerKey" = "8:_8292EFFD84EF46C6BD2F1F3E20808684"
+        "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
+        "OwnerKey" = "8:_CEAF656517E2435A80EA562BDEA99B63"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
+        "OwnerKey" = "8:_14879C6DA33C4224AD56983018EDC817"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_71C343EBC4935F8914C3145115EDEC4A"
+        "OwnerKey" = "8:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -75,10 +87,28 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_9A2FC85FE99C48E8AD1E4813BE33A03A"
+        "MsmKey" = "8:_CEAF656517E2435A80EA562BDEA99B63"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_DE6197491C6C419FAAC463D274A34C18"
+        "OwnerKey" = "8:_8292EFFD84EF46C6BD2F1F3E20808684"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FE85A5D48B5A23F3077871E9FD2378DE"
+        "OwnerKey" = "8:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_FE85A5D48B5A23F3077871E9FD2378DE"
+        "OwnerKey" = "8:_14879C6DA33C4224AD56983018EDC817"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -228,6 +258,46 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_71C343EBC4935F8914C3145115EDEC4A"
+            {
+            "SourcePath" = "8:micasa.dll"
+            "TargetName" = "8:micasa.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_FE85A5D48B5A23F3077871E9FD2378DE"
+            {
+            "SourcePath" = "8:WINHTTP.dll"
+            "TargetName" = "8:WINHTTP.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {
@@ -333,6 +403,17 @@
                     }
                 }
             }
+            "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_E092F841E4D04920B053C3F6A5151BA2"
+            {
+            "Name" = "8:#1914"
+            "AlwaysCreate" = "11:FALSE"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Property" = "8:SystemFolder"
+                "Folders"
+                {
+                }
+            }
             "{29CD8198-A6F0-4B93-8B90-AC03CFEAD328}:_F5F5F604B81645F8B6463F7A7D6A53AD"
             {
             "DefaultLocation" = "8:[ProgramFilesFolder]\\novell\\casa\\lib"
@@ -353,7 +434,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_7A0B81639B6D4DB1839306A9290BDE2D"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_DE6197491C6C419FAAC463D274A34C18"
             {
             "UseDynamicProperties" = "11:FALSE"
             "IsDependency" = "11:TRUE"
@@ -381,7 +462,7 @@
         {
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0C0B5ECE6E9C47F1A1F13B58141B5DC8"
             {
-            "SourcePath" = "8:..\\windows\\Debug\\authtoken.dll"
+            "SourcePath" = "8:..\\windows\\Release\\authtoken.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
@@ -407,9 +488,37 @@
                 {
                 }
             }
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_14879C6DA33C4224AD56983018EDC817"
+            {
+            "SourcePath" = "8:..\\windows\\Release\\authtoken.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_E092F841E4D04920B053C3F6A5151BA2"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{7BD9A5DB-DE7D-40B7-A397-04182DC2F632}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_409269C4EABE4CC18045A808B7B1C104"
             {
-            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
+            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Release\\krb5mech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"
@@ -437,7 +546,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8292EFFD84EF46C6BD2F1F3E20808684"
             {
-            "SourcePath" = "8:..\\csharp\\Novell.Casa.Authtoken\\obj\\Debug\\Novell.Casa.Client.Auth.dll"
+            "SourcePath" = "8:..\\csharp\\Novell.Casa.Authtoken\\obj\\Release\\Novell.Casa.Client.Auth.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8E0BBDD021EA45308BD98380F28EB7F6"
@@ -463,9 +572,9 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_9A2FC85FE99C48E8AD1E4813BE33A03A"
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_CEAF656517E2435A80EA562BDEA99B63"
             {
-            "SourcePath" = "8:..\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
+            "SourcePath" = "8:..\\mechanisms\\pwd\\windows\\Release\\pwmech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F5F5F604B81645F8B6463F7A7D6A53AD"
diff --git a/CASA-auth-token/non-java/client/client.vcproj b/CASA-auth-token/non-java/client/client.vcproj
index 06a2c4b7..fc866dac 100644
--- a/CASA-auth-token/non-java/client/client.vcproj
+++ b/CASA-auth-token/non-java/client/client.vcproj
@@ -81,7 +81,7 @@ copy $(SolutionDir)client\windows\authtoken.lib \"Program Files"\novel
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;XML_STATIC&quot;"
-				AdditionalIncludeDirectories=".;.\windows;..\include;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\Expat-2.0.0\source\lib&quot;"
+				AdditionalIncludeDirectories=".;.\windows;..\include;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\Expat-2.0.0\source\lib&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
@@ -96,7 +96,7 @@ copy $(SolutionDir)client\windows\authtoken.lib \&quot;Program Files&quot;\novel
 				AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
 				OutputFile="$(OutDir)/authtoken.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\Expat-2.0.0\StaticLibs&quot;"
+				AdditionalLibraryDirectories="&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\Expat-2.0.0\StaticLibs&quot;"
 				GenerateDebugInformation="TRUE"
 				SubSystem="0"
 				OptimizeReferences="2"