diff --git a/src/ops.c b/src/ops.c
index b60fca3ea..b8bb53851 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -495,10 +495,11 @@ shift_block(oap, amount)
 	block_space_width = non_white_col - oap->start_vcol;
 	/* We will shift by "total" or "block_space_width", whichever is less.
 	 */
-	shift_amount = (block_space_width < total? block_space_width: total);
+	shift_amount = (block_space_width < (size_t)total
+					 ? block_space_width : (size_t)total);
 
 	/* The column to which we will shift the text.  */
-	destination_col = non_white_col - shift_amount;
+	destination_col = (colnr_T)(non_white_col - shift_amount);
 
 	/* Now let's find out how much of the beginning of the line we can
 	 * reuse without modification.  */
diff --git a/src/version.c b/src/version.c
index 9832d5597..e5e1307fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    158,
 /**/
     157,
 /**/