diff --git a/df.block.xml b/df.block.xml
index 25d06bab9..56a6b67dc 100644
--- a/df.block.xml
+++ b/df.block.xml
@@ -283,7 +283,7 @@
         <static-array name='walkable' count='16' comment='bay12: levelmap'>
             <comment>0 = non-walkable; same nonzero at A and B = walkable from A to B</comment>
             <static-array count='16'>
-                <int16_t/>
+                <int32_t/>
             </static-array>
         </static-array>
         <static-array name='map_edge_distance' count='16' comment='bay12: dlevelmap'>
diff --git a/df.g_src.graphics.xml b/df.g_src.graphics.xml
index 133a0dbe5..00061c21f 100644
--- a/df.g_src.graphics.xml
+++ b/df.g_src.graphics.xml
@@ -472,7 +472,7 @@
         <static-array count='5' name='texpos_short_subsubtab'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array count='5' name='texpos_short_subsubtab_selected'><static-array type-name='int32_t' count='2'/></static-array>
         <int32_t name='texpos_interface_background'/>
-        <static-array count='706' name='texpos_button_main'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
+        <static-array count='710' name='texpos_button_main'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
         <static-array count='13' name='texpos_button_small'><static-array count='2'><static-array type-name='int32_t' count='2'/></static-array></static-array>
         <static-array count='4' name='texpos_button_horizontal_option_left_ornament'><static-array type-name='int32_t' count='3'/></static-array>
         <static-array count='3' name='texpos_button_horizontal_option_active'><static-array type-name='int32_t' count='3'/></static-array>
@@ -757,7 +757,7 @@
         <static-array type-name='long' count='1' name='black_background_texpos'/>
         <static-array type-name='int32_t' count='120' name='texture_indices1'/>
         <stl-vector type-name='int32_t' name='texpos_custom_symbol'/>
-        <static-array type-name='int32_t' count='10967' name='texture_indices2'/>
+        <static-array type-name='int32_t' count='11015' name='texture_indices2'/>
 
         <compound type-name='interface_setst' name='graphical_interface'/>
         <compound type-name='interface_setst' name='classic_interface'/>
diff --git a/df.world.xml b/df.world.xml
index d4ff9b7d7..9782b045d 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -692,7 +692,7 @@
             <int8_t name='pathclear'/>
             <uint16_t name='direction_start'/>
             <int8_t name='direction_clear'/>
-            <int16_t name='next_levelmap'/>
+            <int32_t name='next_levelmap'/>
             <int16_t name='cur_veg_move_stage'/>
             <bool name='preparing_map'/>
         </compound>