diff --git a/src/screen.c b/src/screen.c
index 5b361e9bcc..f85bd08254 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4315,7 +4315,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
 	    long prevcol = (long)(ptr - line) - (c == NUL);
 
 	    /* we're not really at that column when skipping some text */
-	    if ((wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
+	    if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
 		++prevcol;
 #endif
 
diff --git a/src/version.c b/src/version.c
index 156558ee41..fde9d207fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    154,
 /**/
     153,
 /**/