diff --git a/trunk/Assistant/Properties/AssemblyInfo.cs b/trunk/Assistant/Properties/AssemblyInfo.cs
index 964d030d1..80b3e8487 100644
--- a/trunk/Assistant/Properties/AssemblyInfo.cs
+++ b/trunk/Assistant/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.3.6.5")]
+[assembly: AssemblyFileVersion("1.3.6.5")]
diff --git a/trunk/KProcessHacker/auto.cmd b/trunk/KProcessHacker/auto.cmd
index be243492f..3c3d46251 100644
--- a/trunk/KProcessHacker/auto.cmd
+++ b/trunk/KProcessHacker/auto.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-build
+build -cZ
 if not %errorlevel%==0 goto end
 copy i386\kprocesshacker.sys ..\ProcessHacker\bin\Release\
 :end
\ No newline at end of file
diff --git a/trunk/KProcessHacker/debug.h b/trunk/KProcessHacker/debug.h
index 619a757a2..7910cba07 100644
--- a/trunk/KProcessHacker/debug.h
+++ b/trunk/KProcessHacker/debug.h
@@ -20,9 +20,7 @@
  * along with Process Hacker.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define DEBUG
-
-#ifdef DEBUG
+#ifdef DBG
 #define dprintf DbgPrint
 #else
 #define dprintf
diff --git a/trunk/KProcessHacker/i386/kprocesshacker.sys b/trunk/KProcessHacker/i386/kprocesshacker.sys
index 2dccc9e7d..d7ea12574 100644
Binary files a/trunk/KProcessHacker/i386/kprocesshacker.sys and b/trunk/KProcessHacker/i386/kprocesshacker.sys differ
diff --git a/trunk/KProcessHacker/sources b/trunk/KProcessHacker/sources
index afa2acf8c..493f53529 100644
--- a/trunk/KProcessHacker/sources
+++ b/trunk/KProcessHacker/sources
@@ -4,8 +4,8 @@ TARGETPATH=.\
 
 INCLUDES=$(DDK_INC_PATH)
 LIBS=%BUILD%\lib
-RC=resource.rc
 
 SOURCES= \
     kprocesshacker.c \
-    kph_nt.c
+    kph_nt.c \
+    resource.rc
diff --git a/trunk/ProcessHacker/Forms/EditDEPWindow.cs b/trunk/ProcessHacker/Forms/EditDEPWindow.cs
index 9ccbcad83..16fba1160 100644
--- a/trunk/ProcessHacker/Forms/EditDEPWindow.cs
+++ b/trunk/ProcessHacker/Forms/EditDEPWindow.cs
@@ -97,7 +97,8 @@ namespace ProcessHacker
                 if (setProcessDEPPolicy == 0)
                     throw new Exception("This feature is not supported on your version of Windows.");
 
-                using (Win32.ProcessHandle phandle = new Win32.ProcessHandle(_pid, Win32.PROCESS_RIGHTS.PROCESS_CREATE_THREAD))
+                using (Win32.ProcessHandle phandle = new Win32.ProcessHandle(_pid, 
+                    Program.MinProcessQueryRights | Win32.PROCESS_RIGHTS.PROCESS_CREATE_THREAD))
                 {
                     var thread = phandle.CreateThread(setProcessDEPPolicy, (int)flags,
                         Win32.THREAD_RIGHTS.THREAD_ALL_ACCESS);
diff --git a/trunk/ProcessHacker/Providers/ProcessSystemProvider.cs b/trunk/ProcessHacker/Providers/ProcessSystemProvider.cs
index d8bf00a67..4681480fe 100644
--- a/trunk/ProcessHacker/Providers/ProcessSystemProvider.cs
+++ b/trunk/ProcessHacker/Providers/ProcessSystemProvider.cs
@@ -247,7 +247,7 @@ namespace ProcessHacker
             // or:
             // 1. the function-to-library ratio is lower than 4
             //   (on average less than 4 functions are imported from each library)
-            // 2. it references more than 3 libraries
+            // 2. it references more than 3 libraries but less than 14 libraries.
             if (fileName != null)
             {
                 try
@@ -267,7 +267,7 @@ namespace ProcessHacker
 
                         if (
                             libraryTotal < 3 && funcTotal < 5 ||
-                            ((float)funcTotal / libraryTotal < 4) && libraryTotal > 3
+                            ((float)funcTotal / libraryTotal < 4) && libraryTotal > 3 && libraryTotal < 14
                             )
                             fpResult.IsPacked = true;