diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index 80f722e05..1e72e9a1f 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -235,7 +235,7 @@ namespace df
 #define ENUM_NEXT_ITEM(enum,val) \
     (DFHack::next_enum_item_<df::enum,ENUM_FIRST_ITEM(enum),df::enums::enum::is_valid>(val))
 #define FOR_ENUM_ITEMS(enum,iter) \
-    for(df::enum iter = ENUM_FIRST_ITEM(enum); iter < ENUM_LAST_ITEM(enum); iter = df::enum(1+int(iter)))
+    for(df::enum iter = ENUM_FIRST_ITEM(enum); iter <= ENUM_LAST_ITEM(enum); iter = df::enum(1+int(iter)))
 
 namespace df {
 #define DF_KNOWN_GLOBALS \
diff --git a/library/xml b/library/xml
index f6d09c951..0b23a6e28 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit f6d09c95153150d7d1f00592336012af5e6e02ad
+Subproject commit 0b23a6e28b72f8383647b317635d9b75a69529e0