diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp
index a18eb0b..aa99164 100644
--- a/src/GvimExt/gvimext.cpp
+++ b/src/GvimExt/gvimext.cpp
@@ -69,14 +69,14 @@
 
     // Registry didn't work, use the search path.
     if (name[0] == 0)
-	strcpy(name, searchpath("gvim.exe"));
+	strcpy(name, searchpath((char *)"gvim.exe"));
 
     if (!runtime)
     {
 	// Only when looking for the executable, not the runtime dir, we can
 	// search for the batch file or a name without a path.
 	if (name[0] == 0)
-	    strcpy(name, searchpath("gvim.bat"));
+	    strcpy(name, searchpath((char *)"gvim.bat"));
 	if (name[0] == 0)
 	    strcpy(name, "gvim");	// finds gvim.bat or gvim.exe
 
@@ -152,9 +152,9 @@
 	FARPROC	    *ptr;
     } libintl_entry[] =
     {
-	{"gettext",		(FARPROC*)&dyn_libintl_gettext},
-	{"textdomain",		(FARPROC*)&dyn_libintl_textdomain},
-	{"bindtextdomain",	(FARPROC*)&dyn_libintl_bindtextdomain},
+	{(char *)"gettext",		(FARPROC*)&dyn_libintl_gettext},
+	{(char *)"textdomain",		(FARPROC*)&dyn_libintl_textdomain},
+	{(char *)"bindtextdomain",	(FARPROC*)&dyn_libintl_bindtextdomain},
 	{NULL, NULL}
     };
 
@@ -835,7 +835,7 @@
 		    (LPTSTR)location) > (HINSTANCE)32)
 	    return location;
     }
-    return "";
+    return (char *)"";
 }
 # endif
 #endif
diff --git a/src/version.c b/src/version.c
index 11d9443..33bbc7d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    80,
+/**/
     79,
 /**/
     78,