diff --git a/Versions/build.txt b/Versions/build.txt
index bdc2aeae6..d75c403cf 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1717
+1718
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index b9f19dad1..680d89ac8 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.521.1717"
+    version="5.19.522.1718"
     type="win32"
   />
   <description>Notepad3 RC</description>
diff --git a/scionigmo/OnigmoRegExEngine.cxx b/scionigmo/OnigmoRegExEngine.cxx
index b386a0e8f..bf010acdf 100644
--- a/scionigmo/OnigmoRegExEngine.cxx
+++ b/scionigmo/OnigmoRegExEngine.cxx
@@ -789,7 +789,7 @@ extern "C"
 #ifdef SCINTILLA_DLL
 __declspec(dllexport)
 #endif
-ptrdiff_t OnigmoRegExFind(const char* pchPattern, const char* pchText, const bool caseSensitive)
+ptrdiff_t WINAPI OnigmoRegExFind(const char* pchPattern, const char* pchText, const bool caseSensitive)
 {
   const UChar* pattern = reinterpret_cast<const UChar*>(pchPattern);
   const UChar* string = reinterpret_cast<const UChar*>(pchText);
diff --git a/src/Edit.c b/src/Edit.c
index 9620a8a37..137f7ceb2 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -6528,7 +6528,7 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, DocPos rangeStart, DocPos
         DocPos const iWordStart = SciCall_WordStartPosition(iCurrPos, true);
         DocPos const iWordEnd = SciCall_WordEndPosition(iCurrPos, true);
         iFindLength = (iWordEnd - iWordStart);
-        StringCchCopyNA(pszText, HUGE_BUFFER, SciCall_GetRangePointer(iWordStart, iFindLength), iFindLength);
+        StringCchCopyNA(txtBuffer, COUNTOF(txtBuffer), SciCall_GetRangePointer(iWordStart, iFindLength), iFindLength);
       }
       else {
         return; // no selection and no word mark chosen
diff --git a/src/Notepad3.c b/src/Notepad3.c
index a5f2c827f..aa12c38f6 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -6627,7 +6627,7 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
               // clear marks only, if selection changed
               if (iUpd & SC_UPDATE_SELECTION)
               {
-                if (!SciCall_IsSelectionEmpty()) {
+                if (!SciCall_IsSelectionEmpty() || Settings.MarkOccurrencesCurrentWord) {
                   MarkAllOccurrences(Settings2.UpdateDelayMarkAllOccurrences, true);
                 }
                 else {
@@ -6637,8 +6637,8 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
               else if (iUpd & SC_UPDATE_CONTENT) {
                 // ignoring SC_UPDATE_CONTENT cause Style and Marker are out of scope here
                 // using WM_COMMAND -> SCEN_CHANGE  instead!
-                //~~~UpdateVisibleUrlIndics();
                 //~~~MarkAllOccurrences(Settings2.UpdateDelayMarkAllCoccurrences, false);
+                //~~~UpdateVisibleUrlIndics();
               }
             }
             UpdateToolbar();
diff --git a/src/Version.h b/src/Version.h
index 6f2583dc9..c2d050af9 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -67,7 +67,9 @@
 
 #if defined(_MSC_VER)
     #if (_MSC_VER >= 1920)
-        #if(_MSC_FULL_VER >= 192027508)
+        #if(_MSC_FULL_VER >= 192127702)
+            #define VER_CPL     MS Visual C++ 2019 v16.1.0
+        #elif(_MSC_FULL_VER >= 192027508)
             #define VER_CPL     MS Visual C++ 2019 v16.0.(0-4)
         #elif(_MSC_FULL_VER >= 192027027)
             #define VER_CPL     MS Visual C++ 2019 v16.0.Prev(1-4)
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 685ba5b4b..7bbf9bff3 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -7,8 +7,8 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 19
-#define VERSION_REV 521
-#define VERSION_BUILD 1717
+#define VERSION_REV 522
+#define VERSION_BUILD 1718
 #define SCINTILLA_VER 415+
 #define ONIGMO_REGEX_VER 6.2.0
 #define VERSION_PATCH RC