diff --git a/src/regexp.c b/src/regexp.c
index ae1bfd1..7ff271b 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -3047,7 +3047,7 @@
  * Copy of "rmm_maxcol": maximum column to search for a match.  Zero when
  * there is no maximum.
  */
-static int	ireg_maxcol;
+static colnr_T	ireg_maxcol;
 
 /*
  * Sometimes need to save a copy of a line.  Since alloc()/free() is very
@@ -6866,10 +6866,7 @@
 		len = submatch_mmatch->endpos[no].col
 					  - submatch_mmatch->startpos[no].col;
 		if (round == 2)
-		{
-		    STRNCPY(retval, s, len);
-		    retval[len] = NUL;
-		}
+		    vim_strncpy(retval, s, len);
 		++len;
 	    }
 	    else