diff --git a/reactos/dll/win32/clusapi/clusapi.c b/reactos/dll/win32/clusapi/clusapi.c
index 243c97903d2..fa90de31ef3 100644
--- a/reactos/dll/win32/clusapi/clusapi.c
+++ b/reactos/dll/win32/clusapi/clusapi.c
@@ -97,7 +97,7 @@ DWORD WINAPI ClusterCloseEnum(HCLUSENUM hEnum)
  */
 DWORD WINAPI ClusterEnum(HCLUSENUM hEnum, DWORD dwIndex, LPDWORD lpdwType, LPWSTR lpszName, LPDWORD lpcchName)
 {
-    FIXME("(%p, %u, %u, %s, %u) stub!\n", hEnum, dwIndex, *lpdwType, debugstr_w(lpszName), *lpcchName);
+    FIXME("(%p, %u, %u, %p, %u) stub!\n", hEnum, dwIndex, *lpdwType, lpszName, *lpcchName);
 
     return ERROR_NO_MORE_ITEMS;
 }
diff --git a/reactos/dll/win32/clusapi/clusapi.spec b/reactos/dll/win32/clusapi/clusapi.spec
index 5ad0b2e9436..9c6abe2217f 100644
--- a/reactos/dll/win32/clusapi/clusapi.spec
+++ b/reactos/dll/win32/clusapi/clusapi.spec
@@ -12,7 +12,7 @@
 @ stub CloseClusterResource
 @ stdcall ClusterCloseEnum(ptr)
 @ stub ClusterControl
-@ stdcall ClusterEnum(ptr long ptr wstr ptr)
+@ stdcall ClusterEnum(ptr long ptr ptr ptr)
 @ stub ClusterGetEnumCount
 @ stub ClusterGroupCloseEnum
 @ stub ClusterGroupControl
diff --git a/reactos/dll/win32/credui/credui_Ro.rc b/reactos/dll/win32/credui/credui_Ro.rc
index 73a11404198..3d3367e7473 100644
--- a/reactos/dll/win32/credui/credui_Ro.rc
+++ b/reactos/dll/win32/credui/credui_Ro.rc
@@ -47,7 +47,7 @@ STRINGTABLE DISCARDABLE
     IDS_INCORRECTPASSWORDTITLE  "Autentificare eșuată"
     IDS_INCORRECTPASSWORD       "Verificați numele de utilizator și parola."
     IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activată"
-    IDS_CAPSLOCKON      "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit. \n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule."
+    IDS_CAPSLOCKON      "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit.\n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule."
 }
 
 #pragma code_page(default)
diff --git a/reactos/dll/win32/crypt32/protectdata.c b/reactos/dll/win32/crypt32/protectdata.c
index 401e820a929..e6ac16e229c 100644
--- a/reactos/dll/win32/crypt32/protectdata.c
+++ b/reactos/dll/win32/crypt32/protectdata.c
@@ -616,11 +616,9 @@ BOOL fill_protect_data(struct protect_data_t * pInfo, LPCWSTR szDataDescr,
             return FALSE;
         }
         pInfo->salt.cbData=CRYPT32_PROTECTDATA_SALT_LEN;
+        /* debug: show our salt */
+        TRACE_DATA_BLOB(&pInfo->salt);
     }
-
-    /* debug: show our salt */
-    TRACE_DATA_BLOB(&pInfo->salt);
-
     pInfo->cipher.cbData=0;
     pInfo->cipher.pbData=NULL;
 
diff --git a/reactos/dll/win32/cryptui/main.c b/reactos/dll/win32/cryptui/main.c
index f29f1e67e2c..f6fb60c5581 100644
--- a/reactos/dll/win32/cryptui/main.c
+++ b/reactos/dll/win32/cryptui/main.c
@@ -4993,6 +4993,12 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp,
 
         data = (struct ImportWizData *)page->lParam;
         SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data);
+        if (data->fileName)
+        {
+            HWND fileNameEdit = GetDlgItem(hwnd, IDC_IMPORT_FILENAME);
+
+            SendMessageW(fileNameEdit, WM_SETTEXT, 0, (LPARAM)data->fileName);
+        }
         break;
     }
     case WM_NOTIFY:
@@ -5383,10 +5389,15 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent,
     data.dwFlags = dwFlags;
     data.pwszWizardTitle = pwszWizardTitle;
     if (pImportSrc)
+    {
         memcpy(&data.importSrc, pImportSrc, sizeof(data.importSrc));
+        data.fileName = (LPWSTR)pImportSrc->u.pwszFileName;
+    }
     else
+    {
         memset(&data.importSrc, 0, sizeof(data.importSrc));
-    data.fileName = NULL;
+        data.fileName = NULL;
+    }
     data.freeSource = FALSE;
     data.hDestCertStore = hDestCertStore;
     data.freeDest = FALSE;
@@ -5470,7 +5481,8 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent,
     hdr.u4.pszbmWatermark = MAKEINTRESOURCEW(IDB_CERT_WATERMARK);
     hdr.u5.pszbmHeader = MAKEINTRESOURCEW(IDB_CERT_HEADER);
     PropertySheetW(&hdr);
-    HeapFree(GetProcessHeap(), 0, data.fileName);
+    if (data.fileName != data.importSrc.u.pwszFileName)
+        HeapFree(GetProcessHeap(), 0, data.fileName);
     if (data.freeSource &&
      data.importSrc.dwSubjectChoice == CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE)
         CertCloseStore(data.importSrc.u.hCertStore, 0);