diff --git a/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c b/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
index adf9c582dcd..e4b884bf8ac 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
@@ -187,7 +187,7 @@ CsrCallServerFromServer(PCSR_API_MESSAGE ReceiveMsg,
         DPRINT1("CSRSS: %s Api Request received from server process\n",
                 ServerDll->NameTable[ApiId]);
     }
-        
+
     /* Validation complete, start SEH */
     _SEH2_TRY
     {
@@ -433,7 +433,7 @@ CreateBaseAcls(OUT PACL* Dacl,
                                          0, 0, 0, 0, 0, 0, 0,
                                          &RestrictedSid);
     ASSERT(NT_SUCCESS(Status));
-    
+
     /* Allocate one ACL with 3 ACEs each for one SID */
     AclLength = sizeof(ACL) + 3 * sizeof(ACCESS_ALLOWED_ACE) +
                 RtlLengthSid(SystemSid) +
@@ -471,7 +471,7 @@ CreateBaseAcls(OUT PACL* Dacl,
     ASSERT(NT_SUCCESS(Status));
     Status = RtlAddAccessAllowedAce(*RestrictedDacl, ACL_REVISION2, DIRECTORY_TRAVERSE, RestrictedSid);
     ASSERT(NT_SUCCESS(Status));
-    
+
     /* The SIDs are captured, can free them now */
     RtlFreeHeap(CsrHeap, 0, SystemSid);
     RtlFreeHeap(CsrHeap, 0, WorldSid);
@@ -511,7 +511,7 @@ BasepFakeStaticServerData(VOID)
         },
         {0}
     };
-    
+
     /* Get the session ID */
     SessionId = NtCurrentPeb()->SessionId;
 
@@ -641,7 +641,7 @@ BasepFakeStaticServerData(VOID)
     ASSERT(BnoSd);
     Status = RtlCreateSecurityDescriptor(BnoSd, SECURITY_DESCRIPTOR_REVISION);
     ASSERT(NT_SUCCESS(Status));
-    
+
     /* Create the BNO and \Restricted DACLs */
     Status = CreateBaseAcls(&BnoDacl, &BnoRestrictedDacl);
     ASSERT(NT_SUCCESS(Status));
@@ -769,7 +769,7 @@ CsrpHandleConnectionRequest (PPORT_MESSAGE Request)
         DPRINT1("CSRSRV: Unknown process: %lx. Will be rejecting connection\n",
                 Request->ClientId.UniqueProcess);
     }
-    
+
     if ((ProcessData) && (ProcessData != CsrRootProcess))
     {
         /* Attach the Shared Section */
@@ -1068,13 +1068,13 @@ ClientConnectionThread(IN PVOID Parameter)
                 continue;
             }
         }
-        
+
         /* Use whatever Client ID we got */
         Teb->RealClientId = Request->Header.ClientId;
 
         /* Get the Message Type */
         MessageType = Request->Header.u2.s2.Type;
-        
+
         /* Handle connection requests */
         if (MessageType == LPC_CONNECTION_REQUEST)
         {
@@ -1085,7 +1085,7 @@ ClientConnectionThread(IN PVOID Parameter)
             ReplyPort = CsrApiPort;
             continue;
         }
-        
+
         /* It's some other kind of request. Get the lock for the lookup */
         CsrAcquireProcessLock();
 
@@ -1098,7 +1098,7 @@ ClientConnectionThread(IN PVOID Parameter)
         {
             /* This wasn't a CSR Thread, release lock */
             CsrReleaseProcessLock();
-            
+
             /* If this was an exception, handle it */
             if (MessageType == LPC_EXCEPTION)
             {
@@ -1111,7 +1111,7 @@ ClientConnectionThread(IN PVOID Parameter)
                      MessageType == LPC_CLIENT_DIED)
             {
                 /* The Client or Port are gone, loop again */
-                DPRINT1("Death from unknown thread, just continue\n");
+                DPRINT("Death from unknown thread, just continue\n");
                 Reply = NULL;
                 ReplyPort = CsrApiPort;
             }
@@ -1131,7 +1131,7 @@ HandleHardError:
                 {
                     CsrHandleHardError(CsrThread, (PHARDERROR_MSG)Request);
                 }
-                
+
                 /* If the response was 0xFFFFFFFF, we'll ignore it */
                 if (HardErrorMsg->Response == 0xFFFFFFFF)
                 {
@@ -1172,7 +1172,7 @@ HandleHardError:
             /* Keep going */
             continue;
         }
-        
+
         /* We have a valid thread, was this an LPC Request? */
         if (MessageType != LPC_REQUEST)
         {
@@ -1207,7 +1207,7 @@ HandleHardError:
                 ReplyPort = CsrApiPort;
                 continue;
             }
-            
+
             /* Reference the thread and release the lock */
             CsrLockedReferenceThread(CsrThread);
             CsrReleaseProcessLock();
@@ -1253,14 +1253,14 @@ HandleHardError:
         /* We got an API Request */
         CsrLockedReferenceThread(CsrThread);
         CsrReleaseProcessLock();
-        
+
         /* Assume success */
         Reply = Request;
         Request->Status = STATUS_SUCCESS;
 
         /* Now we reply to a particular client */
         ReplyPort = CsrThread->Process->ClientPort;
-        
+
         DPRINT("CSR: Got CSR API: %x [Message Origin: %x]\n",
                 Request->Type,
                 Request->Header.ClientId.UniqueThread);
@@ -1270,19 +1270,19 @@ HandleHardError:
         {
             /* Make sure we have enough threads */
             CsrpCheckRequestThreads();
-            
+
             /* Set the client thread pointer */
             NtCurrentTeb()->CsrClientThread = CsrThread;
 
             /* Call the Handler */
             CsrApiCallHandler(CsrThread->Process, Request);
-            
+
             /* Increase the static thread count */
             _InterlockedIncrement(&CsrpStaticThreadCount);
 
             /* Restore the server thread */
             NtCurrentTeb()->CsrClientThread = ServerThread;
-            
+
             /* Check if this is a dead client now */
             if (Request->Type == 0xBABE)
             {