diff --git a/src/font/fontname.c b/src/font/fontname.c
index 76ed995e..4a82b530 100644
--- a/src/font/fontname.c
+++ b/src/font/fontname.c
@@ -115,7 +115,7 @@ BOOL fontGetFamilyFromName (const char* name, char* family)
     if (*(++family_part) == '\0')
         return FALSE;
 
-    while (family_part [i] && i <= LEN_LOGFONT_NAME_FIELD) {
+    while (family_part [i] && i <= LEN_LOGFONT_FAMILY_FILED) {
         if (family_part [i] == '-' || family_part [i] == ',') {
             family [i] = '\0';
             break;
@@ -157,7 +157,7 @@ static BOOL get_family_part_lower (const char* name, char* family)
 BOOL fontDoesMatchFamily (const char* name, const char* family)
 {
     // make sure there is a redundant space for the tail character.
-    char family_part[LEN_UNIDEVFONT_NAME + 2];
+    char family_part[LEN_LOGFONT_FAMILY_FILED + 2];
     char family_request[LEN_LOGFONT_NAME_FIELD + 2];
     int i = 0;
     size_t len;
diff --git a/src/font/logfont.c b/src/font/logfont.c
index 998af3b8..63e0a202 100644
--- a/src/font/logfont.c
+++ b/src/font/logfont.c
@@ -172,8 +172,8 @@ static PLOGFONT gdiCreateLogFont (const char* type, const char* family,
         else {
             _DBG_PRINTF ("FONT>LogFont: try to match MBC Devfont for family (%s)\n",
                     name_field);
-            if ((devfonts[i] = font_GetMatchedSBDevFont (newlf, name_field)) == NULL)
-                goto error;
+            if ((devfonts[i] = font_GetMatchedMBDevFont (newlf, name_field)) == NULL)
+                break;
 
             iter += n;
             if (*iter == ',' || *iter == ' ')
diff --git a/src/font/sysfont.c b/src/font/sysfont.c
index 0d267fff..80b2103e 100644
--- a/src/font/sysfont.c
+++ b/src/font/sysfont.c
@@ -103,7 +103,7 @@ BOOL mg_InitSysFont (void)
     for (i = 0; i < nr_fonts; i++) {
         char key [11];
         char type [LEN_LOGFONT_NAME_FIELD + 1];
-        char family [LEN_LOGFONT_NAME_FIELD + 1];
+        char family [LEN_LOGFONT_FAMILY_FILED + 1];
         char style [LEN_LOGFONT_NAME_FIELD + 1];
         char charset [LEN_LOGFONT_NAME_FIELD + 1];
         char font_name [LEN_DEVFONT_NAME + 1];