diff --git a/src/fileio.c b/src/fileio.c
index 93e13e3..a2031e9 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4308,7 +4308,7 @@
 	     */
 	    busy = TRUE;
 #ifdef FEAT_EVAL
-	    set_vim_var_string(VV_FCS_REASON, (char_u *)reason, reasonlen);
+	    set_vim_var_string(VV_FCS_REASON, (char_u *)reason, (int)reasonlen);
 	    set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", 0);
 #endif
 	    ++allbuf_lock;
diff --git a/src/strings.c b/src/strings.c
index a71ac91..53e0171 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1265,7 +1265,7 @@
 {
     garray_T	str_ga;
     long	blen;
-    long	idx;
+    int		idx;
 
     ga_init2(&str_ga, sizeof(char), 80);
 
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 5e0fd7d..bf3e889 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -4282,6 +4282,9 @@
     call assert_equal(0zABBB0AABBB, str2blob(['«»', '«»'], {'encoding': 'latin1'}))
     call assert_equal(0zC2ABC2BB, str2blob(['«»'], {'encoding': 'utf8'}))
 
+    call assert_equal(0z62, str2blob(["b"], test_null_dict()))
+    call assert_equal(0z63, str2blob(["c"], {'encoding': test_null_string()}))
+
     call assert_fails("call str2blob(['abc'], [])", 'E1206: Dictionary required for argument 2')
     call assert_fails("call str2blob(['abc'], {'encoding': []})", 'E730: Using a List as a String')
     call assert_fails("call str2blob(['abc'], {'encoding': 'ab12xy'})", 'E1515: Unable to convert to ''ab12xy'' encoding')
diff --git a/src/version.c b/src/version.c
index 43a84e8..d273ce7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1031,
+/**/
     1030,
 /**/
     1029,