diff --git a/Setup/builder2debug_setup.iss b/Setup/builder2debug_setup.iss
new file mode 100644
index 00000000..e6f17a42
--- /dev/null
+++ b/Setup/builder2debug_setup.iss
@@ -0,0 +1,51 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+AppName=Doom Builder 2
+AppVerName=Doom Builder 2.0
+AppPublisher=CodeImp
+AppPublisherURL=http://www.codeimp.com/
+AppSupportURL=http://www.doombuilder.com/
+AppUpdatesURL=http://www.doombuilder.com/
+DefaultDirName={pf}\Doom Builder 2
+DefaultGroupName=Doom Builder
+AllowNoIcons=true
+InfoBeforeFile=E:\Projects\Doom Builder\Setup\disclaimer.txt
+OutputDir=E:\Projects\Doom Builder\Setup
+OutputBaseFilename=builder2debug_setup
+Compression=lzma/ultra64
+SolidCompression=true
+SourceDir=E:\Projects\Doom Builder\Build
+SetupLogging=false
+AppMutex=doombuilder2
+PrivilegesRequired=poweruser
+ShowLanguageDialog=no
+
+[Languages]
+Name: english; MessagesFile: compiler:Default.isl
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+
+[Files]
+Source: Builder.exe; DestDir: {app}; Flags: ignoreversion
+Source: Builder.pdb; DestDir: {app}; Flags: ignoreversion
+Source: d3dx9_35.dll; DestDir: {app}; Flags: ignoreversion
+Source: SlimDX.dll; DestDir: {app}; Flags: ignoreversion
+Source: Builder.cfg; DestDir: {app}; Flags: ignoreversion
+Source: Compilers\*; DestDir: {app}\Compilers; Flags: ignoreversion
+Source: Configurations\*; DestDir: {app}\Configurations; Flags: ignoreversion
+Source: Scripting\*; DestDir: {app}\Scripting; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: {group}\Doom Builder; Filename: {app}\Builder.exe
+Name: {group}\{cm:UninstallProgram,Doom Builder}; Filename: {uninstallexe}
+Name: {commondesktop}\Doom Builder; Filename: {app}\Builder.exe; Tasks: desktopicon
+
+[Run]
+Filename: {app}\Builder.exe; Description: {cm:LaunchProgram,Doom Builder}; Flags: nowait postinstall skipifsilent
+
+[UninstallDelete]
+Name: {app}\Builder.log; Type: files
diff --git a/Source/Builder.csproj b/Source/Builder.csproj
index 84ec5703..8015b83e 100644
--- a/Source/Builder.csproj
+++ b/Source/Builder.csproj
@@ -207,14 +207,4 @@
     <EmbeddedResource Include="Resources\Actions.cfg" />
     <None Include="Resources\Splash2.png" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="stdole">
-      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-    </COMReference>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/General/General.cs b/Source/General/General.cs
index 03829a8f..6363d70b 100644
--- a/Source/General/General.cs
+++ b/Source/General/General.cs
@@ -314,9 +314,12 @@ namespace CodeImp.DoomBuilder
 			configspath = Path.Combine(apppath, GAME_CONFIGS_DIR);
 			compilerspath = Path.Combine(apppath, COMPILERS_DIR);
 			logfile = Path.Combine(settingspath, LOG_FILE);
-
+			
+			// Make program settings directory if missing
+			if(!Directory.Exists(settingspath)) Directory.CreateDirectory(settingspath);
+			
 			// Remove the previous log file and start logging
-			File.Delete(logfile);
+			if(File.Exists(logfile)) File.Delete(logfile);
 			General.WriteLogLine("Doom Builder " + thisversion.Major + "." + thisversion.Minor + " startup");
 			General.WriteLogLine("Application path:     " + apppath);
 			General.WriteLogLine("Temporary path:       " + temppath);
@@ -370,9 +373,6 @@ namespace CodeImp.DoomBuilder
 			string message;
 			DialogResult result;
 			
-			// Make program settings directory if missing
-			if(!Directory.Exists(settingspath)) Directory.CreateDirectory(settingspath);
-			
 			// Check if no config for this user exists yet
 			if(!File.Exists(Path.Combine(settingspath, SETTINGS_FILE)))
 			{