diff --git a/src/move.c b/src/move.c
index 46e4f35..a0d3a60 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1753,10 +1753,7 @@
 	    ++row;
 	}
 	if (col > width2 && width2 > 0)
-	{
 	    row += col / width2;
-	    col = col % width2;
-	}
 	if (row >= curwin->w_height)
 	{
 	    curwin->w_curswant = curwin->w_virtcol
@@ -1989,10 +1986,7 @@
 	++row;
     }
     if (col > width2)
-    {
 	row += col / width2;
-	col = col % width2;
-    }
     if (row >= curwin->w_height)
     {
 	if (curwin->w_skipcol == 0)
diff --git a/src/strings.c b/src/strings.c
index 33616d6..c04cbe8 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -2596,7 +2596,7 @@
 		    CHECK_POS_ARG;
 		}
 	    }
-	    else if (VIM_ISDIGIT((int)(*(arg = p))))
+	    else if (VIM_ISDIGIT((int)(*p)))
 	    {
 		// size_t could be wider than unsigned int; make sure we treat
 		// argument like common implementations do
@@ -2651,7 +2651,7 @@
 			CHECK_POS_ARG;
 		    }
 		}
-		else if (VIM_ISDIGIT((int)(*(arg = p))))
+		else if (VIM_ISDIGIT((int)(*p)))
 		{
 		    // size_t could be wider than unsigned int; make sure we
 		    // treat argument like common implementations do
@@ -2684,7 +2684,7 @@
 		if (length_modifier == 'l' && *p == 'l')
 		{
 		    // double l = __int64 / varnumber_T
-		    length_modifier = 'L';
+		    // length_modifier = 'L';
 		    p++;
 		}
 	    }
diff --git a/src/version.c b/src/version.c
index ec25a12..a946279 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1997,
+/**/
     1996,
 /**/
     1995,