diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index 256e30304..fca87d823 100644
Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 2bbd0fec8..0caf0c51f 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -573,10 +573,6 @@ SubSection "Auto-completion Files" autoCompletionComponent
 		File "..\bin\plugins\APIs\nsis.xml"
 	SectionEnd
 
-	Section AWK
-		SetOutPath "$INSTDIR\plugins\APIs"
-		File "..\bin\plugins\APIs\awk.xml"
-	SectionEnd	
 SubSectionEnd
 
 SubSection "Plugins" Plugins
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index 8b7cb9a33..9c752477b 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -2,6 +2,10 @@ copy /Y ".\nativeLang\*.*" ..\bin\localization\
 
 cd ..\bin\
 
+del /F /Q .\npp.*.Installer.exe
+del /F /Q .\npp.bin.7z
+del /F /Q .\npp.bin.zip
+
 del /F /S /Q .\zipped.package.release\unicode\*.*
 copy /Y license.txt .\zipped.package.release\unicode\
 copy /Y readme.txt .\zipped.package.release\unicode\
diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
index 4c6da995b..742ebe1b5 100644
--- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
+++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
@@ -609,6 +609,13 @@ BOOL CALLBACK SettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM)
 			::SendDlgItemMessage(_hSelf, IDC_CHECK_REMEMBERSESSION, BM_SETCHECK, nppGUI._rememberLastSession, 0);
 			::SendDlgItemMessage(_hSelf, IDC_CHECK_AUTOUPDATE, BM_SETCHECK, !nppGUI._neverUpdate, 0);
 
+			bool isVistaAndAfter = (pNppParam->getWinVersion() >= WV_VISTA);
+			if (isVistaAndAfter)
+			{
+				::SendDlgItemMessage(_hSelf, IDC_CHECK_AUTOUPDATE, BM_SETCHECK, FALSE, 0);
+				::EnableWindow(::GetDlgItem(_hSelf, IDC_CHECK_AUTOUPDATE), FALSE);
+			}
+
 			::ShowWindow(::GetDlgItem(_hSelf, IDC_CHECK_AUTOUPDATE), nppGUI._doesExistUpdater?SW_SHOW:SW_HIDE);
 			
 			BOOL linkEnable = FALSE;
diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp
index e70c9f086..1f3ef9707 100644
--- a/PowerEditor/src/winmain.cpp
+++ b/PowerEditor/src/winmain.cpp
@@ -291,8 +291,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int)
 	bool doUpdate = !nppGui._neverUpdate;
 	bool winSupported = (curWinVer >= WV_W2K);
 
-	// Vista UAC de mes couilles!!!
-	bool isVista = (curWinVer == WV_VISTA);
+	// Vista/Win7 UAC de mes couilles!!!
+	bool isVista = (curWinVer >= WV_VISTA);
 
 	if (!winSupported)
 		nppGui._doesExistUpdater = false;