diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index 00d4c517d..6dfb2f354 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -77,6 +77,7 @@ distribution.
 #include "df/job_material_category.h"
 #include "df/burrow.h"
 #include "df/building_civzonest.h"
+#include "df/region_map_entry.h"
 
 #include <lua.h>
 #include <lauxlib.h>
@@ -931,8 +932,7 @@ static int maps_getRegionBiome(lua_State *L)
 static int maps_getTileBiomeRgn(lua_State *L)
 {
     auto pos = CheckCoordXYZ(L, 1, true);
-    Lua::PushPosXY(L, Maps::getTileBiomeRgn(pos));
-    return 1;
+    return Lua::PushPosXY(L, Maps::getTileBiomeRgn(pos));
 }
 
 static const luaL_Reg dfhack_maps_funcs[] = {
diff --git a/library/include/modules/Maps.h b/library/include/modules/Maps.h
index e63eef733..e6e9682eb 100644
--- a/library/include/modules/Maps.h
+++ b/library/include/modules/Maps.h
@@ -258,7 +258,7 @@ inline df::tile_occupancy *getTileOccupancy(df::coord pos) {
 /**
  * Returns biome info about the specified world region.
  */
-DFHACK_EXPORT df::world_data::T_region_map *getRegionBiome(df::coord2d rgn_pos);
+DFHACK_EXPORT df::region_map_entry *getRegionBiome(df::coord2d rgn_pos);
 
 /**
  * Returns biome world region coordinates for the given tile within given block.
diff --git a/library/modules/Maps.cpp b/library/modules/Maps.cpp
index 3ab156d77..4107680b0 100644
--- a/library/modules/Maps.cpp
+++ b/library/modules/Maps.cpp
@@ -57,6 +57,7 @@ using namespace std;
 #include "df/builtin_mats.h"
 #include "df/block_square_event_grassst.h"
 #include "df/z_level_flags.h"
+#include "df/region_map_entry.h"
 
 using namespace DFHack;
 using namespace df::enums;
@@ -166,7 +167,7 @@ df::tile_occupancy *Maps::getTileOccupancy(int32_t x, int32_t y, int32_t z)
     return block ? &block->occupancy[x&15][y&15] : NULL;
 }
 
-df::world_data::T_region_map *Maps::getRegionBiome(df::coord2d rgn_pos)
+df::region_map_entry *Maps::getRegionBiome(df::coord2d rgn_pos)
 {
     auto data = world->world_data;
     if (!data)
diff --git a/library/xml b/library/xml
index 3fc2e1569..328a8dbdc 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 3fc2e1569ff19953d11b6ea651bc9b8ca832b8a3
+Subproject commit 328a8dbdc7d9e1e838798abf79861cc18a387e3f
diff --git a/plugins/changelayer.cpp b/plugins/changelayer.cpp
index 317a0fa36..3ab1899af 100644
--- a/plugins/changelayer.cpp
+++ b/plugins/changelayer.cpp
@@ -19,6 +19,7 @@
 #include "df/world_data.h"
 #include "df/world_geo_biome.h"
 #include "df/world_geo_layer.h"
+#include "df/region_map_entry.h"
 
 using namespace DFHack;
 using namespace df::enums;
diff --git a/plugins/devel/rprobe.cpp b/plugins/devel/rprobe.cpp
index e19dbf9ba..805489d5e 100644
--- a/plugins/devel/rprobe.cpp
+++ b/plugins/devel/rprobe.cpp
@@ -27,6 +27,7 @@ using namespace std;
 #include "df/world_region_details.h"
 #include "df/world_geo_biome.h"
 #include "df/world_geo_layer.h"
+#include "df/region_map_entry.h"
 #include "df/inclusion_type.h"
 #include "df/viewscreen_choose_start_sitest.h"
 
@@ -113,7 +114,7 @@ command_result rprobe (color_ostream &out, vector <string> & parameters)
     {
         coord2d rg = screen->biome_rgn[i];
 
-        df::world_data::T_region_map* rd = &data->region_map[rg.x][rg.y];
+        auto rd = &data->region_map[rg.x][rg.y];
 
         if (set && i == to_set) {
             if (set_field == 0)
diff --git a/plugins/probe.cpp b/plugins/probe.cpp
index 2ae6846d5..45ef1bbfb 100644
--- a/plugins/probe.cpp
+++ b/plugins/probe.cpp
@@ -27,6 +27,7 @@ using namespace std;
 #include "df/world.h"
 #include "df/world_raws.h"
 #include "df/building_def.h"
+#include "df/region_map_entry.h"
 
 using std::vector;
 using std::string;
@@ -224,8 +225,7 @@ command_result df_probe (color_ostream &out, vector <string> & parameters)
     int bx = clip_range(block.region_pos.x + (offset % 3) - 1, 0, world->world_data->world_width-1);
     int by = clip_range(block.region_pos.y + (offset / 3) - 1, 0, world->world_data->world_height-1);
 
-    df::world_data::T_region_map* biome = 
-        &world->world_data->region_map[bx][by];
+    auto biome = &world->world_data->region_map[bx][by];
 
     int sav = biome->savagery;
     int evi = biome->evilness;
diff --git a/plugins/prospector.cpp b/plugins/prospector.cpp
index e2f1e9534..6836b38c2 100644
--- a/plugins/prospector.cpp
+++ b/plugins/prospector.cpp
@@ -27,6 +27,7 @@ using namespace std;
 #include "df/world_region_details.h"
 #include "df/world_geo_biome.h"
 #include "df/world_geo_layer.h"
+#include "df/region_map_entry.h"
 #include "df/inclusion_type.h"
 #include "df/viewscreen_choose_start_sitest.h"
 
@@ -536,6 +537,8 @@ command_result prospector (color_ostream &con, vector <string> & parameters)
                         case tiletype_material::LAVA_STONE:
                             // TODO ?
                             break;
+                        default:
+                            break;
                         }
                     }
                 }