diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj
index 7ed2446eb..4a2c554a2 100644
--- a/Greenshot/Greenshot.csproj
+++ b/Greenshot/Greenshot.csproj
@@ -155,7 +155,9 @@
     <PostBuildEvent>"$(MSBuildProjectDirectory)\tools\TortoiseSVN\SubWCRev.exe" "$(MSBuildProjectDirectory)\." "$(MSBuildProjectDirectory)\releases\innosetup\setup.iss" "$(MSBuildProjectDirectory)\releases\innosetup\setup-SVN.iss"
 cd "$(MSBuildProjectDirectory)\bin\Release"
 "$(MSBuildProjectDirectory)\tools\FileVerifier++\fvc.exe" -c -a MD5 -r -o "checksum.MD5" *.dll *.exe
+"$(MSBuildProjectDirectory)\tools\7zip\7za.exe" a -x!.SVN -r "$(MSBuildProjectDirectory)\releases\Greenshot-NO-INSTALLER.zip" "$(MSBuildProjectDirectory)\bin\Release\*" "$(MSBuildProjectDirectory)\releases\additional_files\*"
+cd "$(MSBuildProjectDirectory)\releases\innosetup"
 "$(MSBuildProjectDirectory)\tools\innosetup\ISCC.exe" "$(MSBuildProjectDirectory)\releases\innosetup\setup-SVN.iss"
-"$(MSBuildProjectDirectory)\tools\7zip\7za.exe" a -x!.SVN -r "$(MSBuildProjectDirectory)\releases\Greenshot-NO-INSTALLER.zip" "$(MSBuildProjectDirectory)\bin\Release\*" "$(MSBuildProjectDirectory)\releases\additional_files\*"</PostBuildEvent>
+</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Greenshot/releases/innosetup/scripts/products.iss b/Greenshot/releases/innosetup/scripts/products.iss
index fc17e6270..3effdfcf3 100644
--- a/Greenshot/releases/innosetup/scripts/products.iss
+++ b/Greenshot/releases/innosetup/scripts/products.iss
@@ -35,9 +35,9 @@ en.depinstall_error=An error occured while installing the dependencies. Please r
 de.depinstall_error=Ein Fehler ist während der Installation der Abghängigkeiten aufgetreten. Bitte starten Sie den Computer neu und führen Sie das Setup erneut aus oder installieren Sie die folgenden Abhängigkeiten per Hand:%n
 de.depinstall_error=Er is een fout tijdens de installatie van de afhankelijkheiden opgetreden. Start uw computer door en laat de setup nog een keer lopen of installeer de volgende afhankelijkheiden met de hand:%n
 
-nl.isxdl_langfile=english.ini
+en.isxdl_langfile=english.ini
 de.isxdl_langfile=german2.ini
-
+nl.isxdl_langfile=english.ini
 
 [Files]
 Source: "scripts\isxdl\german2.ini"; Flags: dontcopy
diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss
index 6a8a2ed51..9da031d12 100644
--- a/Greenshot/releases/innosetup/setup.iss
+++ b/Greenshot/releases/innosetup/setup.iss
@@ -161,10 +161,6 @@ begin
 end;
 
 function InitializeSetup(): Boolean;
-var
-	ErrorCode : Integer;
-	NetFrameWorkInstalled : Boolean;
-	MsgBoxResult : Boolean;
 begin
 	// Enhance installer otherwise .NET installations won't work
 	msi20('2.0');