diff --git a/Setup2/Cosmos.iss b/Setup2/Cosmos.iss
index deed2c65e..04e8295e3 100644
--- a/Setup2/Cosmos.iss
+++ b/Setup2/Cosmos.iss
@@ -7,13 +7,11 @@
 #if BuildConfiguration == "Devkit"
 	; devkit releases are not compressed
 	#pragma warning "Building Devkit release"
-#elif BuildConfiguration == "Userkit"
+#else 
 	; userkit releases get compressed, and get languages included
 	#pragma message "Building Userkit release"
 	#define Compress true
 	#define IncludeUILanguages true
-#else
-# error Unsupported configuration
 #endif
 
 ; Cosmos Registry key
@@ -31,17 +29,18 @@ AppSupportURL=http://www.goCosmos.org/
 AppUpdatesURL=http://www.goCosmos.org/
 AppVersion={#ChangeSetVersion}
 DefaultDirName={userappdata}\Cosmos User Kit
+;DefaultDirName=m:\Cosmos User Kit -- Only about 2-3 seconds faster. The GAC and other things seem to be the majority of the slowness
 DefaultGroupName=Cosmos User Kit
 OutputDir=.\Setup2\Output
 OutputBaseFilename=CosmosUserKit
 #ifdef Compress
 Compression=lzma2/ultra64
 InternalCompressLevel=ultra64
+SolidCompression=true
 #else
 Compression=none
 InternalCompressLevel=none
 #endif
-SolidCompression=true
 SourceDir=..
 ;Left Image should be 164x314
 WizardImageFile=.\setup2\images\cosmos.bmp
diff --git a/Setup2/Events.inc b/Setup2/Events.inc
index 6b2ea2513..645cf385b 100644
--- a/Setup2/Events.inc
+++ b/Setup2/Events.inc
@@ -9,7 +9,7 @@ begin
 		Exec(ExpandConstant('{code:VSNET2010_PATH|}\devenv.exe'), '/setup', '', SW_HIDE, ewWaitUntilTerminated, xResultCode);
 		if xResultCode <> 0 then
 		begin
-			RaiseException('An error occurred while unregistering with Visual Studio!');
+			RaiseException('An error occurred while unregistering Cosmos from Visual Studio!');
 		end;	
 	finally
 		EnableFsRedirection(false);