diff --git a/reactos/dll/win32/advapi32/sec/misc.c b/reactos/dll/win32/advapi32/sec/misc.c
index a2c7ce04f40..35868ea2d1b 100644
--- a/reactos/dll/win32/advapi32/sec/misc.c
+++ b/reactos/dll/win32/advapi32/sec/misc.c
@@ -723,7 +723,6 @@ GetUserNameA( LPSTR lpszName, LPDWORD lpSize )
 
   /* apparently Win doesn't check whether lpSize is valid at all! */
 
-  NameW.Length = 0;
   NameW.MaximumLength = (*lpSize) * sizeof(WCHAR);
   NameW.Buffer = LocalAlloc(LMEM_FIXED, NameW.MaximumLength);
   if(NameW.Buffer == NULL)
@@ -740,6 +739,7 @@ GetUserNameA( LPSTR lpszName, LPDWORD lpSize )
                      lpSize);
   if(Ret)
   {
+    NameW.Length = (*lpSize) * sizeof(WCHAR);
     RtlUnicodeStringToAnsiString(&NameA, &NameW, FALSE);
     NameA.Buffer[NameA.Length] = '\0';
 
diff --git a/reactos/dll/win32/kernel32/misc/computername.c b/reactos/dll/win32/kernel32/misc/computername.c
index 530ef338ec9..c0a0f7ffc14 100644
--- a/reactos/dll/win32/kernel32/misc/computername.c
+++ b/reactos/dll/win32/kernel32/misc/computername.c
@@ -232,7 +232,7 @@ GetComputerNameExA (
     UNICODE_STRING UnicodeString;
     ANSI_STRING AnsiString;
     BOOL Result;
-    PWCHAR TempBuffer = RtlAllocateHeap( GetProcessHeap(), 0, *nSize * sizeof(WCHAR) );
+    PWCHAR TempBuffer = RtlAllocateHeap( RtlGetProcessHeap(), 0, *nSize * sizeof(WCHAR) );
 
     if( !TempBuffer ) {
 	return ERROR_OUTOFMEMORY;
@@ -254,7 +254,7 @@ GetComputerNameExA (
 				      FALSE);
     }
 
-    HeapFree( GetProcessHeap(), 0, TempBuffer );
+    RtlFreeHeap( RtlGetProcessHeap(), 0, TempBuffer );
 
     return Result;
 }