diff --git a/dict.c b/dict.c
index 48482a5..9935a25 100644
--- a/dict.c
+++ b/dict.c
@@ -843,7 +843,7 @@ xmlDictLookup(xmlDictPtr dict, const xmlChar *name, int len) {
 		    return(insert->name);
 	    }
 #else
-	    if ((insert->okey == okey) && (insert->l == l) &&
+	    if ((insert->okey == okey) && (insert->len == l) &&
 	        (!xmlStrncmp(insert->name, name, l)))
 		return(insert->name);
 #endif
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 8ef4f5e..b028e1c 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -108,7 +108,8 @@ LDFLAGS = $(LDFLAGS)
 !endif
 
 # Libxml object files.
-XML_OBJS = $(XML_INTDIR)\c14n.obj\
+XML_OBJS = $(XML_INTDIR)\buf.obj\
+    $(XML_INTDIR)\c14n.obj\
 	$(XML_INTDIR)\catalog.obj\
 	$(XML_INTDIR)\chvalid.obj\
 	$(XML_INTDIR)\debugXML.obj\
@@ -153,7 +154,8 @@ XML_OBJS = $(XML_INTDIR)\c14n.obj\
 	$(XML_INTDIR)\xmlstring.obj
 
 # Static libxml object files.
-XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\
+XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\
+    $(XML_INTDIR_A)\c14n.obj\
 	$(XML_INTDIR_A)\catalog.obj\
 	$(XML_INTDIR_A)\chvalid.obj\
 	$(XML_INTDIR_A)\debugXML.obj\
@@ -198,7 +200,8 @@ XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\
 	$(XML_INTDIR_A)\xmlstring.obj
 
 # Static libxml object files.
-XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\c14n.obj\
+XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\buf.obj\
+    $(XML_INTDIR_A_DLL)\c14n.obj\
 	$(XML_INTDIR_A_DLL)\catalog.obj\
 	$(XML_INTDIR_A_DLL)\chvalid.obj\
 	$(XML_INTDIR_A_DLL)\debugXML.obj\