diff --git a/src/os_mswin.c b/src/os_mswin.c
index 48a6972..448b2bf 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -664,7 +664,7 @@
 display_errors(void)
 {
 # ifdef FEAT_GUI
-    char *p;
+    char_u *p;
 
 #  ifdef VIMDLL
     if (gui.in_use || gui.starting)
@@ -673,7 +673,7 @@
 	if (error_ga.ga_data != NULL)
 	{
 	    // avoid putting up a message box with blanks only
-	    for (p = (char *)error_ga.ga_data; *p; ++p)
+	    for (p = (char_u *)error_ga.ga_data; *p; ++p)
 		if (!isspace(*p))
 		{
 		    // Only use a dialog when not using --gui-dialog-file:
@@ -684,7 +684,7 @@
 					     VIM_ERROR,
 				     gui.starting ? (char_u *)_("Message") :
 					     (char_u *)_("Error"),
-				     (char_u *)p, (char_u *)_("&Ok"),
+					     p, (char_u *)_("&Ok"),
 					1, NULL, FALSE);
 		    break;
 		}
diff --git a/src/version.c b/src/version.c
index eef7e51..b1f4254 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5085,
+/**/
     5084,
 /**/
     5083,