diff --git a/src/Dialogs.c b/src/Dialogs.c
index 5937df22c..b50d786f5 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -505,13 +505,11 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam
 
   #if true
 
-    char pAboutRes1[4000];
-    GetLngStringA(IDS_MUI_ABOUT_RTF_1, pAboutRes1, COUNTOF(pAboutRes1));
-    char pAboutRes2[4000];
-    GetLngStringA(IDS_MUI_ABOUT_RTF_2, pAboutRes2, COUNTOF(pAboutRes2));
-
-    StringCchCopyA(pAboutResource, COUNTOF(pAboutResource), pAboutRes1);
-    StringCchCatA(pAboutResource, COUNTOF(pAboutResource), pAboutRes2);
+    char pAboutRes[4000];
+    GetLngStringA(IDS_MUI_ABOUT_RTF_1, pAboutRes, COUNTOF(pAboutRes));
+    StringCchCopyA(pAboutResource, COUNTOF(pAboutResource), pAboutRes);
+    GetLngStringA(IDS_MUI_ABOUT_RTF_2, pAboutRes, COUNTOF(pAboutRes));
+    StringCchCatA(pAboutResource, COUNTOF(pAboutResource), pAboutRes);
 
     EDITSTREAM editStreamIn = { (DWORD_PTR)&pAboutInfo, 0, _LoadRtfCallback };
     pAboutInfo = pAboutResource;
diff --git a/src/Edit.c b/src/Edit.c
index 8335cf2af..2c485f52a 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -4276,7 +4276,7 @@ void EditSortLines(HWND hwnd, int iSortFlags)
   if (!(iSortFlags & SORT_UNIQDUP) || (iZeroLenLineCount == 0)) {
     StrTrimA(pmszResOffset, "\r\n"); // trim end only
   }
-  if ((iSortFlags & SORT_UNIQDUP) && (iZeroLenLineCount > 1)) { 
+  if (((iSortFlags & SORT_UNIQDUP) && (iZeroLenLineCount > 1)) || (iSortFlags & SORT_MERGEDUP)) {
     iZeroLenLineCount = 1; // removes duplicate empty lines
   }
   if (!(iSortFlags & SORT_REMZEROLEN)) {
@@ -5143,6 +5143,15 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
       {
         if (!bSwitchedFindReplace)
         {
+          if (s_anyMatch == MATCH) {
+            // Save MRUs
+            if (StringCchLenA(sg_pefrData->szFind, COUNTOF(sg_pefrData->szFind))) {
+              if (GetDlgItemText(hwnd, IDC_FINDTEXT, tchBuf, COUNTOF(tchBuf))) {
+                MRU_Add(g_pMRUfind, tchBuf, 0, 0, NULL);
+                SetFindPattern(tchBuf);
+              }
+            }
+          }
           sg_pefrData->szFind[0] = '\0';
 
           g_iMarkOccurrences = iSaveMarkOcc;