diff --git a/src/mbyte.c b/src/mbyte.c
index e3c47d6..ece5c8a 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -1400,7 +1400,7 @@
  * utf_char2cells() with different argument type for libvterm.
  */
     int
-utf_uint2cells(uint32_t c)
+utf_uint2cells(UINT32_T c)
 {
     return utf_char2cells((int)c);
 }
@@ -2312,7 +2312,7 @@
  * utf_iscomposing() with different argument type for libvterm.
  */
     int
-utf_iscomposing_uint(uint32_t c)
+utf_iscomposing_uint(UINT32_T c)
 {
     return utf_iscomposing((int)c);
 }
diff --git a/src/misc1.c b/src/misc1.c
index 632571d..b0589cf 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -3757,7 +3757,7 @@
      * platforms, $HOMEDRIVE and $HOMEPATH are automatically defined for
      * each user.  Try constructing $HOME from these.
      */
-    if (var == NULL || *var == NULL)
+    if (var == NULL || *var == NUL)
     {
 	char_u *homedrive, *homepath;
 
diff --git a/src/proto/mbyte.pro b/src/proto/mbyte.pro
index b37064b..44fcfc5 100644
--- a/src/proto/mbyte.pro
+++ b/src/proto/mbyte.pro
@@ -10,7 +10,7 @@
 int latin_char2bytes(int c, char_u *buf);
 int latin_ptr2len(char_u *p);
 int latin_ptr2len_len(char_u *p, int size);
-int utf_uint2cells(uint32_t c);
+int utf_uint2cells(UINT32_T c);
 int utf_char2cells(int c);
 int latin_ptr2cells(char_u *p);
 int utf_ptr2cells(char_u *p);
@@ -38,7 +38,7 @@
 int utfc_ptr2len_len(char_u *p, int size);
 int utf_char2len(int c);
 int utf_char2bytes(int c, char_u *buf);
-int utf_iscomposing_uint(uint32_t c);
+int utf_iscomposing_uint(UINT32_T c);
 int utf_iscomposing(int c);
 int utf_printable(int c);
 int utf_class(int c);
diff --git a/src/version.c b/src/version.c
index 26604fd..8f6d26f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1014,
+/**/
     1013,
 /**/
     1012,