diff --git a/reactos/subsystems/csr/csrsrv/api.c b/reactos/subsystems/csr/csrsrv/api.c
index 75c19d47afd..38fd18fa955 100644
--- a/reactos/subsystems/csr/csrsrv/api.c
+++ b/reactos/subsystems/csr/csrsrv/api.c
@@ -153,15 +153,15 @@ CsrSbApiPortInitialize(VOID)
     InitializeObjectAttributes(&ObjectAttributes,
                                &CsrSbApiPortName,
                                0,
-                               PortSd,
-                               NULL);
+                               NULL,
+                               PortSd);
 
     /* Create the Port Object */
     Status = NtCreatePort(&CsrSbApiPort,
                           &ObjectAttributes,
                           sizeof(SB_CONNECTION_INFO),
-                          sizeof(PSB_API_MSG),
-                          32 * sizeof(PSB_API_MSG));
+                          sizeof(SB_API_MSG),
+                          32 * sizeof(SB_API_MSG));
     if (PortSd) RtlFreeHeap(CsrHeap, 0, PortSd);
 
     if (NT_SUCCESS(Status))
diff --git a/reactos/subsystems/csr/csrsrv/init.c b/reactos/subsystems/csr/csrsrv/init.c
index 3402bf6d549..eee4f3d28d6 100644
--- a/reactos/subsystems/csr/csrsrv/init.c
+++ b/reactos/subsystems/csr/csrsrv/init.c
@@ -771,8 +771,8 @@ CsrSetDirectorySecurity(IN HANDLE ObjectDirectory)
  *--*/
 NTSTATUS
 NTAPI
-CsrServerInitialization(ULONG ArgumentCount,
-                        PCHAR Arguments[])
+CsrServerInitialization(IN ULONG ArgumentCount,
+                        IN PCHAR Arguments[])
 {
     NTSTATUS Status = STATUS_SUCCESS;
     ULONG i = 0;
@@ -865,7 +865,7 @@ CsrServerInitialization(ULONG ArgumentCount,
         ServerDll = CsrLoadedServerDll[i];
 
         /* Is it loaded, and does it have per process data? */
-        if (ServerDll && ServerDll->SizeOfProcessData)
+        if ((ServerDll) && (ServerDll->SizeOfProcessData))
         {
             /* It does, give it part of our allocated heap */
             CsrRootProcess->ServerData[i] = ProcessData;
@@ -888,10 +888,10 @@ CsrServerInitialization(ULONG ArgumentCount,
         ServerDll = CsrLoadedServerDll[i];
 
         /* Is it loaded, and does it a callback for new processes? */
-        if (ServerDll && ServerDll->NewProcessCallback)
+        if ((ServerDll) && (ServerDll->NewProcessCallback))
         {
             /* Call the callback */
-            (*ServerDll->NewProcessCallback)(NULL, CsrRootProcess);
+            ServerDll->NewProcessCallback(NULL, CsrRootProcess);
         }
     }