diff --git a/CASA/launcher/Program.cs b/CASA/launcher/Program.cs
index 29d0436f..a678a0b2 100644
--- a/CASA/launcher/Program.cs
+++ b/CASA/launcher/Program.cs
@@ -43,7 +43,12 @@ namespace launcher
 
         private static string GetPathToCasaManager()
         {
-            string targetDir = Environment.GetEnvironmentVariable("ProgramFiles");
+            string targetDir = Environment.GetEnvironmentVariable("ProgramFiles(x86)");
+            if ((targetDir == null) || (targetDir.Length == 0))
+            {
+                targetDir = Environment.GetEnvironmentVariable("ProgramFiles");
+            }
+
             targetDir = targetDir + string.Format(@"\Novell\CASA\bin");
             return targetDir;
         }
diff --git a/CASA/package/windows/vs_solutions/CASA64-msi/CASA-64-32.sln b/CASA/package/windows/vs_solutions/CASA64-msi/CASA-64-32.sln
index 64b19081..8af2aa14 100644
--- a/CASA/package/windows/vs_solutions/CASA64-msi/CASA-64-32.sln
+++ b/CASA/package/windows/vs_solutions/CASA64-msi/CASA-64-32.sln
@@ -67,6 +67,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jmicasa", "..\..\..\..\jwra
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.Casa.MiCasa", "..\..\..\..\sharp\Novell.Casa.MiCasa\Novell.Casa.MiCasa.csproj", "{7B56383F-6551-4BCD-81BB-A039BBECBD9C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "launcher", "..\..\..\..\launcher\launcher.csproj", "{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -580,6 +582,22 @@ Global
 		{7B56383F-6551-4BCD-81BB-A039BBECBD9C}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Any CPU
 		{7B56383F-6551-4BCD-81BB-A039BBECBD9C}.Release|Win32.ActiveCfg = Release|Any CPU
 		{7B56383F-6551-4BCD-81BB-A039BBECBD9C}.Release|x64.ActiveCfg = Release|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Debug|ia64.ActiveCfg = Debug|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Release|ia64.ActiveCfg = Release|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Release|Win32.ActiveCfg = Release|Any CPU
+		{D267C0E4-584C-4A9A-B189-50CEA39ACA4B}.Release|x64.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE