diff --git a/reactos/ntoskrnl/include/internal/ob.h b/reactos/ntoskrnl/include/internal/ob.h
index 2a5551574f4..1d25c8a6262 100644
--- a/reactos/ntoskrnl/include/internal/ob.h
+++ b/reactos/ntoskrnl/include/internal/ob.h
@@ -373,7 +373,8 @@ typedef struct _INFORMATION_CLASS_INFO
     else if(ClassList[Class].RequiredSize##Mode > 0 &&                         \
             (BufferLen) != ClassList[Class].RequiredSize##Mode)                \
     {                                                                          \
-      if(!(ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) ||            \
+      if((!(ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) &&           \
+           (BufferLen) != ClassList[Class].RequiredSize##Mode) ||              \
          ((ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) &&            \
           (BufferLen) < ClassList[Class].RequiredSize##Mode))                  \
       {                                                                        \
@@ -387,6 +388,7 @@ typedef struct _INFORMATION_CLASS_INFO
   }                                                                            \
   } while(0)
 
+
 #define GetInfoClassAlignment(Class, ClassList, AlignmentVar, Mode)            \
   do {                                                                         \
   if((Class) >= 0 && (Class) < sizeof(ClassList) / sizeof(ClassList[0]))       \
diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index 024f3c050aa..2064bcb884b 100644
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -1695,7 +1695,8 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
    NTSTATUS Status = STATUS_SUCCESS;
    
    PreviousMode = ExGetPreviousMode();
-   
+
+   DPRINT1("NtSetInformationProcess() %d %x  %x called\n", ProcessInformationClass, ProcessInformation, ProcessInformationLength);
    DefaultSetInfoBufferCheck(ProcessInformationClass,
                              PsProcessInfoClass,
                              ProcessInformation,
@@ -1704,7 +1705,7 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
                              &Status);
    if(!NT_SUCCESS(Status))
    {
-     DPRINT1("NtSetInformationProcess() failed, Status: 0x%x\n", Status);
+     DPRINT1("NtSetInformationProcess() %x failed, Status: 0x%x\n", Status);
      return Status;
    }
    
diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c
index 2205748bf8d..4935d0efd9d 100644
--- a/reactos/ntoskrnl/se/token.c
+++ b/reactos/ntoskrnl/se/token.c
@@ -1564,7 +1564,7 @@ SepCreateSystemProcessToken(struct _EPROCESS* Process)
 NTSTATUS STDCALL
 NtCreateToken(OUT PHANDLE UnsafeTokenHandle,
 	      IN ACCESS_MASK DesiredAccess,
-	      IN POBJECT_ATTRIBUTES UnsafeObjectAttributes,
+	      IN POBJECT_ATTRIBUTES ObjectAttributes,
 	      IN TOKEN_TYPE TokenType,
 	      IN PLUID AuthenticationId,
 	      IN PLARGE_INTEGER ExpirationTime,
@@ -1579,7 +1579,6 @@ NtCreateToken(OUT PHANDLE UnsafeTokenHandle,
   HANDLE TokenHandle;
   PTOKEN AccessToken;
   NTSTATUS Status;
-  POBJECT_ATTRIBUTES ObjectAttributes;
   LUID TokenId;
   LUID ModifiedId;
   PVOID EndMem;
diff --git a/reactos/subsys/system/userinit/userinit.c b/reactos/subsys/system/userinit/userinit.c
index ecbcf96456e..2e7bfd1f9b1 100644
--- a/reactos/subsys/system/userinit/userinit.c
+++ b/reactos/subsys/system/userinit/userinit.c
@@ -143,7 +143,6 @@ WinMain(HINSTANCE hInst,
 	LPSTR lpszCmdLine,
 	int nCmdShow)
 {
-  DPRINT1("Hello\n");
   SetUserSettings();
   StartShell();
   return 0;