diff --git a/reactos/dll/ntdll/ldr/ldrinit.c b/reactos/dll/ntdll/ldr/ldrinit.c
index 8bb2e40d219..da065c4b973 100644
--- a/reactos/dll/ntdll/ldr/ldrinit.c
+++ b/reactos/dll/ntdll/ldr/ldrinit.c
@@ -1996,9 +1996,11 @@ NTAPI
 LdrpInitFailure(NTSTATUS Status)
 {
     ULONG Response;
+    PPEB Peb = NtCurrentPeb();
 
     /* Print a debug message */
-    DPRINT1("LDR: Process initialization failure; NTSTATUS = %08lx\n", Status);
+    DPRINT1("LDR: Process initialization failure for %wZ; NTSTATUS = %08lx\n",
+            &Peb->ProcessParameters->ImagePathName, Status);
 
     /* Raise a hard error */
     if (!LdrpFatalHardErrorCount)
diff --git a/reactos/subsystems/win32/csrss/csrsrv/api/process.c b/reactos/subsystems/win32/csrss/csrsrv/api/process.c
index 42174f03c69..c1e7fdb1921 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/api/process.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/api/process.c
@@ -105,7 +105,7 @@ PCSRSS_PROCESS_DATA WINAPI CsrCreateProcessData(HANDLE ProcessId)
                                 PROCESS_ALL_ACCESS,
                                 &ObjectAttributes,
                                 &ClientId);
-          DPRINT1("CSR PRocess: %p Handle: %p\n", pProcessData, pProcessData->Process);
+         DPRINT1("CSR Process: %p Handle: %p\n", pProcessData, pProcessData->Process);
          if (!NT_SUCCESS(Status))
          {
             ProcessData[hash] = pProcessData->next;
diff --git a/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c b/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
index 72d4e811022..678cbde92ca 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
@@ -12,8 +12,6 @@
 
 #include <srv.h>
 
-#define NDEBUG
-
 #define NDEBUG
 #include <debug.h>
 
@@ -181,7 +179,6 @@ CsrSrvCreateSharedSection(IN PCHAR ParameterValue)
     if (!NT_SUCCESS(Status)) return Status;
     
     /* Multiply by 1024 entries and round to page size */
-    #define ROUND_UP(n,size)	(((ULONG)(n) + (size - 1)) & ~(size - 1)) // hax
     CsrSrvSharedSectionSize = ROUND_UP(Size * 1024, CsrNtSysInfo.PageSize);
     DPRINT1("Size: %lx\n", CsrSrvSharedSectionSize);
     
diff --git a/reactos/subsystems/win32/csrss/csrsrv/init.c b/reactos/subsystems/win32/csrss/csrsrv/init.c
index 6ab51c2c546..e0b1a99c094 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/init.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/init.c
@@ -514,9 +514,12 @@ CsrpCreateHeap (int argc, char ** argv, char ** envp)
     
     
     Status = CsrSrvCreateSharedSection(Value);
-    DPRINT1("Status: %lx\n", Status);
-    ASSERT(Status == STATUS_SUCCESS);
-    
+    if (Status != STATUS_SUCCESS)
+    {
+        DPRINT1("CsrSrvCreateSharedSection failed with status 0x%08lx\n", Status);
+        ASSERT(FALSE);
+    }
+
     BasepFakeStaticServerData();
 	return STATUS_SUCCESS;
 }
diff --git a/reactos/subsystems/win32/csrss/csrsrv/srv.h b/reactos/subsystems/win32/csrss/csrsrv/srv.h
index b784e6ed575..34d2e4130a8 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/srv.h
+++ b/reactos/subsystems/win32/csrss/csrsrv/srv.h
@@ -18,3 +18,7 @@
 /* Internal CSRSS Headers */
 #include <api.h>
 #include <csrplugin.h>
+
+/* Defines */
+#define ROUND_UP(n, align) ROUND_DOWN(((ULONG)n) + (align) - 1, (align))
+#define ROUND_DOWN(n, align) (((ULONG)n) & ~((align) - 1l))