diff --git a/src/ops.c b/src/ops.c
index 5d1b75f..5b12e68 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5597,7 +5597,10 @@
 	    vc.vc_type = CONV_NONE;
 	    if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK)
 	    {
-		conv_str = string_convert(&vc, str, (int*)&len);
+	        int intlen = len;
+
+		conv_str = string_convert(&vc, str, &intlen);
+		len = intlen;
 		if (conv_str != NULL)
 		{
 		    vim_free(str);
diff --git a/src/version.c b/src/version.c
index 248fac7..d27eeb5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    304,
+/**/
     303,
 /**/
     302,