diff --git a/reactos/dll/win32/newdev/newdev.c b/reactos/dll/win32/newdev/newdev.c
index 73384f64ea9..9b157fdbad5 100644
--- a/reactos/dll/win32/newdev/newdev.c
+++ b/reactos/dll/win32/newdev/newdev.c
@@ -150,7 +150,7 @@ UpdateDriverForPlugAndPlayDevicesW(
 			TRACE("SetupDiGetDeviceInstanceIdW() failed with error 0x%x\n", GetLastError());
 			goto cleanup;
 		}
-		else if ((Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize)) == NULL)
+		else if ((Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize * sizeof(WCHAR))) == NULL)
 		{
 			TRACE("HeapAlloc() failed\n", GetLastError());
 			SetLastError(ERROR_NOT_ENOUGH_MEMORY);
diff --git a/reactos/dll/win32/newdev/wizard.c b/reactos/dll/win32/newdev/wizard.c
index c34c1c2b1c9..90a049aa073 100644
--- a/reactos/dll/win32/newdev/wizard.c
+++ b/reactos/dll/win32/newdev/wizard.c
@@ -236,7 +236,7 @@ PopulateCustomPathCombo(
 {
 	HKEY hKey = NULL;
 	DWORD dwRegType;
-	DWORD dwPathLength;
+	DWORD dwPathLength = 0;
 	LPWSTR Buffer = NULL;
 	LPCWSTR Path;
 	LONG rc;