diff --git a/HACKING b/HACKING
index 16d005993..3c450c93a 100644
--- a/HACKING
+++ b/HACKING
@@ -298,8 +298,8 @@ META_LOOKBEHIND_NA    (*naplb:  start of non-atomic lookbehind
 META_LOOKBEHINDNOT    (?<!      start of negative lookbehind
 
 The following are followed by two elements, the minimum and maximum. The
-maximum value is limited to 65535 (MAX_REPEAT). A maximum value of "unlimited"
-is represented by REPEAT_UNLIMITED, which is bigger than MAX_REPEAT:
+maximum value is limited to 65535 (MAX_REPEAT_COUNT). A maximum value of
+"unlimited" is represented by REPEAT_UNLIMITED, which is bigger than it:
 
 META_MINMAX           {n,m}  repeat
 META_MINMAX_PLUS      {n,m}+ repeat
diff --git a/src/pcre2_match.c b/src/pcre2_match.c
index 6d193366b..ab6f4cd0a 100644
--- a/src/pcre2_match.c
+++ b/src/pcre2_match.c
@@ -5767,7 +5767,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode);
           break;
           }
         Feptr--;
-        if (utf) { BACKCHAR(Feptr); }
+        BACKCHAR(Feptr);
         }
       }
     else
@@ -5776,7 +5776,8 @@ fprintf(stderr, "++ op=%d\n", *Fecode);
     /* No UTF support or not in UTF mode */
 
       {
-      ptrdiff_t available = Feptr - mb->start_subject;
+      ptrdiff_t diff = Feptr - mb->start_subject;
+      uint32_t available = diff > 65535 ? 65535 : diff;
       if (Lmin > available) RRETURN(MATCH_NOMATCH);
       if (Lmax > available) Lmax = available;
       Feptr -= Lmax;